Some formatting and intro message changes

See commits for full details.

If you would like me to split this into several separate pull requests, or if you only want some of the changes I proposed merged, by all means, let me know and I will comply.