week 7 - bugfixes