Final annotations for check against wiki done