various small things, comments, a cli bugfix etc.