multiple bugfixes
Merge branch 'master' of https://github.com/joachimschreurs/absoluutnietworms.git