emptied default map, improved docs, fixed tests