fix features and winnow code
Merge branch 'winnow'