Corrected encoding and sev new features