Fixed HW1 bugs.