fix some rt cleanup and failure edge cases

"marker" is here but not used for anything- I think it should be in the details.