Touchups to annotations. Demo test.