some leaks fixed