Bug fixes. Improved commandLine