refactoring demos, version bump