Update

Better formulation in Annotations and some on-the-fly notes in
Requirements.otl.