type_finders check, and few enhancements.