Thesaurus! and bugs fixing