checked all dictionary changes and fixed bugs