BULK changes

**feature selection, mostly
**refactoring