Buttoning up some 7m head stuff | 7mge rebuild p17