Updates from code/PHPdocs checks

Removed use of eval and corrected invalid PHPdocs for new
functions/classes