Minor code & demo cleanup with version bump