Change version requirements, minor bug fixes

Minor changes resulting in new submission.