More usability fixes

More little usability fixes to the avocado CLI.