List formatting and other minor tweaks