Updated PhpDoc and fixed some minor issues