Minor CLI fixes
Renamed ParseArgs class to ProgramArgs