Fix for #354, and some other minor formatting/layout changes.