Fixed minor bugs
Merge branch 'Exercise/Mandatory2/dev' of https://github.com/jannickj/nabf into Exercise/Mandatory2/dev