formatting improvements and adding more comments to config