fixing upstream changes
fix accidently uncommenting
fixing upstream reversions; mostly columnheadings, some progress on c-cedilla features