cli: additional flags and cleanup