Various small fixes

This fixes issue #144 Also I found various small issues while auditing the code. (After all the refactors, there were bound to be some loose ends). Since I did not want to make 10 different PRs each of these small changes are properly embedded in their own small commit. After this I think we are ready for 2.0.0!