fixed nitpicks