pick up latest edits from original branch, modified to use highspot formatting rules

picked up the latest 2 bug fixes from the original branch.  we are now current.