better docblocks and a couple fixes