hw6-3 fixing some things