Minor refactor in heaps & add demos