Fixed typo in method (possible BC break)
Fixed PHPDoc
Clean up classes and write comments