Update argument outline
Tidy up files for master