diff --git a/config/core.php b/config/core.php
index 58adff02f..5ba8ec071 100644
--- a/config/core.php
+++ b/config/core.php
@@ -14,8 +14,8 @@
 //////////////////////////////////////////////////////////////////////////
 
 /**
-  * Purpose: core.php
-  * Enter description here...
+  * This is core configuration file. Use it to configure core behaviour of
+  * Cake.
   *
   * @filesource 
   * @author Cake Authors/Developers
@@ -30,36 +30,32 @@
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
   */
 
-// Debugging level
-// 0: production, 1: development, 2: full debug with sql
 /**
-  * Enter description here...
-  *
-  */
+ * Set debug level here:
+ * - 0: production
+ * - 1: development
+ * - 2: full debug with sql
+ */
 define ('DEBUG', 0);
 
-// Full-page caching
 /**
-  * Enter description here...
-  *
-  */
+ * Page cacheing setting.
+ */
 define ('CACHE_PAGES', false);
-// Cache lifetime in seconds, 0 for debugging, -1 for eternity,
+
 /**
-  * Enter description here...
-  *
-  */
+ * Cache lifetime in seconds, 0 for debugging, -1 for eternity.
+ */
 define ('CACHE_PAGES_FOR', -1);
 
-
 /**
-  * Advanced configuration
-  */
-// Debug options
-if (DEBUG) {
-	error_reporting(E_ALL);
-	ini_set('error_reporting', E_ALL);
-	$TIME_START = getmicrotime();
+ * Set any extra debug options here.
+ */
+if (DEBUG)
+{
+    error_reporting(E_ALL);
+    ini_set('error_reporting', E_ALL);
+    $TIME_START = getmicrotime();
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/config/database.php.default b/config/database.php.default
index 095d67f15..21e66f2fb 100644
--- a/config/database.php.default
+++ b/config/database.php.default
@@ -14,8 +14,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 /**
-  * Purpose: core.php
-  * Enter description here...
+  * In this file you set up your database connection details.
   *
   * @filesource 
   * @author Cake Authors/Developers
@@ -31,9 +30,9 @@
   */
 
 /**
-  * Enter description here...
+  * Database configuration array. You can configure multiple connections.
   *
-  * @var unknown_type $DATABASE_CONFIG
+  * @var array $DATABASE_CONFIG
   */
 $DATABASE_CONFIG = array(
 	'devel' => array(
@@ -54,4 +53,4 @@ $DATABASE_CONFIG = array(
 
 );
 
-?>
\ No newline at end of file
+?>
diff --git a/config/paths.php b/config/paths.php
index 6b3427cb9..0f1d189fb 100644
--- a/config/paths.php
+++ b/config/paths.php
@@ -14,8 +14,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 /**
-  * Purpose: Paths
-  * Enter description here...
+  * In this file you set paths to different directories used by Cake.
   *
   * @filesource 
   * @author Cake Authors/Developers
@@ -31,84 +30,83 @@
   */
 
 /**
-  * If index.php file is used instead of an .htaccess file
-  * or if user can not set the web root to use the public
-  * directory we will define ROOT there otherwise we set it
-  * here
-  *
-  */
+ * If index.php file is used instead of an .htaccess file
+ * or if user can not set the web root to use the public
+ * directory we will define ROOT there otherwise we set it
+ * here
+ */
 if( !defined('ROOT') ){
 	define ('ROOT',	'../');
 }
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the application directory.
+ */
 define ('APP',			ROOT.'app/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the application models directory.
+ */
 define ('MODELS',			APP.'models/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the application controllers directory.
+ */
 define ('CONTROLLERS',	APP.'controllers/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the application helpers directory.
+ */
 define ('HELPERS',		APP.'helpers/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the application views directory.
+ */
 define ('VIEWS',			APP.'views/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the configuration files directory.
+ */
 define ('CONFIGS',	ROOT.'config/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the libs directory.
+ */
 define ('LIBS',		ROOT.'libs/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the public directory.
+ */
 define ('PUBLIC',		ROOT.'public/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the tests directory.
+ */
 define ('TESTS',		ROOT.'tests/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the vendors directory.
+ */
 define ('VENDORS',	ROOT.'vendors/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the controller test directory.
+ */
 define ('CONTROLLER_TESTS',TESTS.'app/controllers/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the helpers test directory.
+ */
 define ('HELPER_TESTS',		TESTS.'app/helpers/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the models test directory.
+ */
 define ('MODEL_TESTS',		TESTS.'app/models/');
+
 /**
-  * Enter description here...
-  *
-  */
+ * Path to the lib test directory.
+ */
 define ('LIB_TESTS',		TESTS.'libs/')
 
-?>
\ No newline at end of file
+?>