New annotations (in fact only highlights)

Another take on annotations.