Fix some code highlight issues
Add ga