CLI ui starting point
some minor fixes

Alexis