fixed some stuff - moved some stuff