Comment fixes
Comment fixes, minor configuration change
Cosmetics