various nitpicks