remover lexical class, fized cmake, added to text class for different searches