switched to party abbreviations, some related formating changes