some leaks hopefully fixed