update
update
update
fixed some stuff
moved some stuff
minor fixes