Various changed from Jonathan

Nice! Thanks for correcting my SNAFUs