More Refactor, adding new CLI parameters, QSS