More comments and a new command line encoder.