more codehighlighter fixes