Added docblocks, small fixes