added missing uses for docblocks
updated exceptions and docblocks