Bugfixes, preparation for exam