Language auto-detection bug fix.
Some styling fixups.