fixed phpdoc errors and updated properties
updated classmap