code areas refactored, bug fix, version bump