updated dictonary and script + minor changes