README updates, clever use of map with two collections to simplify some code