fixed more leaks