More phpDoc
Changed hook signature (may change again because current version looks too long)
Rearrange methods and attributes