various deprecation fixes and phpdoc fixes refs #141