MBH: cleanup and adding in content