HM\MP bars added
some fixes