Added highlighting, fixed some bugs