bugfixes etc
Merge branch 'master' of https://github.com/MrKaws/Proftaak