fixed some stuff
cleaned up some stuff