Small improvements
CLI