Added dictionary. Small changes here and there.