Heap all right.
Bugs fixed.