ECSTR13x6: Some improvements.