Merging 42sh

A lot of diff noise but a few real changes.