Added SortedMap, Map.Entry. Tightened up more interfaces.