misc fixes

with these fixes and updates, the test suite passes for me again. getting ready to publish soon!