Comments patched up and reformated.