more CLI bugfixes.