Whole lotta fixes

Address #12, some of #42, and #44