more gameplay bugfixes