Commiting stuff before I sleep. Slight readablity upgrades. Began fixing main game loop.