fixing of various things. including the annotation