more minor fixes ("you win")