small fixes to get the game working and testable