Fixed leading assertions, mapTo ; added remap method.  Added more tests.