Added documentation to generator
Fixed a merge conflict in generator that had to do with comments