fixed bugs in assignment 6, and updated for assignment 7