Merged changes im gamemodel from client
Minor cleanup
Merge branch 'gamemodel' into network