Simplify the dictionary

Simplify the dictionary so we can add more words easier
Fixed the dimension unmatching bug