Cleanup
Bug fix
Updates show_mapping command