Mapping

More fixes, plus updates.