moritzbuhl make things work, attempt to find more leaks