Fix email, whitespacing, master-origin mapping