highlight marker bug
Merge Emily's minor changes