Wat wijzigingen en sjit
Some more minor changes
Checked comments by @TiddoLangerak