some CLI changes, general improvement.