a few leaks fixed, still three leaks