updated with BM Cleanup/Abstraction as well as final fixes for content on mainpage module QA readiness