Merge fixes/improvements from rkowert.com