minor improvements, mostly to CLI, to improve usability