fixed some stuff, will hand this in now