more nitpicks