final syntax highlight fixes