More Format changes and touch-ups