Docblocks + fixes