bug fixes + small additions for hxmr