Update HW1

Fixed some bugs...