updates per 19Dec feedback from @whimboo