added more tweet classifiers
merge + small refactoring