moving comments to TODO, and minor ignore format