Cleaned up code, fixed inability to move, many other fixes