header style consistency
various cleanups
Examples are back