Add more features in the classifier & Bug fix