Bugfixes after sprint 3 review
Merge branch 'notes'