bugfixes, options, and version bump