Formatting, and misc tweaks