+ Fixed some memory leaks