Fixing some doc blocks, adding properties to objects and removing old
code
Some random doc fixes
Fixing unit tests