Be more agressive when highlighting.
Don't read the last line twice.
This caused problems when including files.
Updates in highlight rules.