Edit R files for args, correct some minor things