API, PHPLoc and some other changes