Fixed huge bug, and fixed movement