A whole bunch of design changes suggested by Drew and Lawson.