updated merged files, cleaned up some stuff
fixed movement