Hopefully fixed things
Some more changes and version bump.