H1M10 more fixes and changes