first stab at drawing arrows, and some code cleanup.