more refactoring
various fix.
failing on test showing that mapping is not happening