Fix sinking issues with infinite recursion. Attempt to pinpoint remaining bugs.