Friendly CLI help; minor improvements