Simon dev 2.5

Hi Joaquin,

Sorry for taking this long.  I cherry picked everything based on your feedback to be in this one branch.

Thanks for your feedback!

Sincerely
Simon