Fixed doc and added missing annotations