Minor cleanup.
Prepare the stenogram annotation routine (for finding MP names)
Finish the mps annotation routines.