fixed all the quirks in new twill version