code cleanup, fixed error in share bitmap, lots of cleanup/changes to GameState