Misc. fixes and presentation tweaks.