MBH: updates and cleanup