Minor adjustments to yencoder to comply with specs.