Fixing docblocks and some CS errors