method name fix; add some PHPDocs