refactors and version bump