Fixed the leak.

Still buggy & slow. Minor mem leak still in place.