fixes & sync

Includes a fix to a very ugly bug in the fontconfig scanner.