updated the dictionary and other minor things.