Working... game?

Other than that, a few improvements