MBH: cleanup and additions