Init: exploring CmdArgs further
Init: fixed up CmdArgs, refactored some