Some polishing up

More descriptive (and polite) comments.

Fixes for some minor oversights