Add correct phpdoc blocks
fix indentation in try/catch blocks