Moved to Cli, comments and 2-pass-encoding added