added build_vocab method, did some variable renaming, starting to work on build_classifier