update docblocks, rearrange ctor params