lots of clean-ups -- use arrow and annotate now