Integrate Dad's changes and clean up

This includes the refactoring of header rows and other items into
\newcommands, which is pretty nifty.