Various bug fixes and updates are included here. This merge will also increment the version to v0.3.2.