Seems done. Heap graphs look odd though.