fixed some things for hand-in