Fixing a few bugs and version bump