Submitting a bunch of refactoring and bug work to create a 0.3.2

Didn't expect to need this release, but bad bugs cropped up. Decided just to update 0.3.x to master.