HW 3 more bug fixes.