fixed up some stuff, now all working