last bug fixes en new bugs added
Merge pull request #15 from DrCake/main

Merge
Merge pull request #16 from DrCake/vlakken

Vlakken to main merge