More linting and fixing of comments and PHP Doc, types, etc.