Accept map options as second class constructor argument
Wrap init in iffy
Code quality cleanup