A number of fixes relating to grafting. Also adding admin option to save logic.