fix docblocks, and cakephp coding standarts