some fixes for code highlighting