Refines some of the issues reported by @sback (thx!)