massively updated dictionaryMaker. Mostly works.