More annotations, and make RuleBndr Located for ann