fixes in hw2