Cmd file improvements...