fixed up some stuff