did some more changes to hw2