Prelim. xpath, annotation improvements