more minor tidy-ups & comment fixes