More mem leak fixed, no more leaks