some modifications to dictionary, a first pass at rules
resolved differences