Command Args Fixes. Closes issue #13