Added RmFile->basename and updated TODOs