minor fixes and changes around catch sets