Header is in much better shape now; misc style tweaks