Config Fixes; Comment changes