Fix some annotations and add the necessary ones for new functions.
Attach a file by drag & drop or click to upload
