Merged in more of Guv'ner's changes