Add encoding, improve help