fix of doc blocks for chaining returns
Generator now allows columns to be named id if it is the primary key