Fixes and additions in h.i. class.
Creating correct partitioning.