Fixed weird movement bug, got rid of alot of bad code