few changes and dictionnaries