Compelted more work on the CLI parser in settings.cpp