* PhpDoc types, cleanups and fixes