Fixing even more brainfarts.
Moved code from main.cc to clientGameState.cc.

Also little updates here and there.