Final push before D-day!

Lot's of little style tweaks and a few additions.