- removed another bunch of memory leaks