Fixing up clever command, cleanup, extra info