Updated Hippie and restored heap type choice.
As previous commit...