Minor touch-ups to layout and design