final cleanup and contact page
Merge branch 'master' into prod
fixup new code and updates