handle empty and unknown cmds, add missed file from previous commit