Various improvements and version bump