Update.

Added some missing annotations and fixed some existing ones.