fixing bugs, digging into game mode