correct some crashes and unregistration problems.
improve syntax highlighting.