Fixed some bugs
- Classifier