(Pairing w/ Mike Hagedorn)

* Cleaned up options mapping
* Reserved dup of original keyword args
* Made initializer a little more functional