Tremendous cleanup in the code. Preparing to total rewriting of game.