cleanup  - add new cli options