Phase2 he21

Bug fixes to previous HExx (topology and geometry)