WIP on fixing depth bounds.