fixed some stuff, compiled