Cleanup, Documentation & 2 Heap Leaks fixed