some fixes regarding my own work, started to merge answers to hand in :)
Merge branches 'master' and 'master' of https://github.com/haren/UvA_SoftwareTestingAndVerification_GrD2_1