Fix pgmdo
Finish and tidy up hw2