bug fixes + dictionaries feeded