- Quite a lot of changes had to be done, because some variables were only accesible locally.
- Some includes might not be needed, needs a second look.

Refs #4