various right rail cleanup bits