cleaned up some stuff, made coherent things