fixing formatting issues, metadata, switcher; no staging required.
Merge pull request #1438 from mollybostic/master_0430

fixing formatting issues, metadata, switcher; no staging required.