Game fixes

Various fixes and improvements.