reorg so that it runs without silly errors
Slight comment changes