Updates: allow cleanup after CLI calls; allow CLI options along with parameters.
Minor: documentation and refactors.