Fixed some stuff, cleanup