Fixed comments and phpdocs