fixes from game testing