- fix a bug in mapper
- slightly nicer output!