Update Master with missing commits

Tread softly, and carry a big gun