removed left over package tags
updated exceptions and docblocks