Better formatting, and other fixes.