fixed up some stuff for lab 8