Changed some CLI aspects.