Fix a sample-config error and moved a chunch of commented code around in the framework.php file.