fixed some things for assignment 6