fixed some issues, update test.
uncommeted the version bump.