Various fixes, some game client code