Yeah, I started with a single issue and now this PR already includes 5.  I will make it 6 on Tuesday (at least this one will only be a couple liner (ha, and that is how I got this large PR :) )