Cleaned up some #includes, fixed movement due to new time system