Tweaks based on Lodle's comments  on initial commit #649