Correct pointed out by Loup; other touch-ups