fixes to GameState

*fixed removing objects out of order they were added in causing the
server to crash
*some renames to private variables to fit style guides. No changes to
api.