vjr bug fixes, refactoring, syntax highlighting extensions