Finalizing code for beta

* Updating DocBlocks
* Fixing typos
* Adjusting whitespace