HW 8 and bugfixes