Updates and fixes, version bump