minor changes in mapper and documentation.