Memory leaks fixed...