(1) added no. features found.
(2) minor refactoring here and there.