mapping lifetime

more xml documentation
clean up
mapping lifetime