add syntax highlighting, fix some syntax position issues