Fixed up some errors in source generator

And two lines of commenting