surgery fixup

fixes of my last commit