Update to accomodate change in `map-key` module
Various improvements
0.2.1