Added some phpdoc
CS
Fixed Events