lots and lots of formatting, and tweaks. Still working.