Upgraded the unboxed vector for keys
unshuffled the code for heaps