Cleanup the DocBlocks, add missing variables.

Did some cleaning on the DocBlocks and comments. Also added missing variables to the DocBlocks.