more mapping, and refectoring/name fixing.