solved some more leaks, created some more test.