Few documentation fixes
Added object types and improved tests
Added some bits of documentation