New external commands and some TODOs