minor enhancements

brought up to speed with the fiddle I created earlier.

functioning prototype.