Drak,

I'll try these changes out but note that i'm trying to make sure that this produces successful output when run through phpdocumentor. Certainly @package is quite widely used throughout the codebase.....

-Mark