Minor changes and fix to map

fixed map output and the readme