Fix a doc block
Fix docblocks - and functionality :P
Update unit tests