Various fixes and tweaks. Game runs much better now.