add Eye and Mouth detector and some minor refactoring