Added highlight code
Changed some of the marker routines' names for consistency to
differentiate from highlighting