Some optimizations, version bump