docblocks + small fixes