Fixed one memory leak, suspect more leaks are present