fontenc fix and minor tweak