Enable new dictionaries and fix minor issues
run ./format.pl