fixed coding conventions/phpdocs
more coding convention/phpdocs fixes
fixed factory factory