diff --git a/src/loaders/index.js b/src/loaders/index.js
index 5063bab..7781074 100644
--- a/src/loaders/index.js
+++ b/src/loaders/index.js
@@ -9,8 +9,8 @@
  * @namespace PIXI
  */
 module.exports = {
-  //  Loader:     require('resource-loader'),
-    Loader:     require('./Loader'),
+    //  Loader:     require('resource-loader'),
+    Loader:     require('./loader'),
 
     // parsers
     bitmapFontParser:   require('./bitmapFontParser'),

diff --git a/src/loaders/index.js b/src/loaders/index.js
index 5063bab..7781074 100644
--- a/src/loaders/index.js
+++ b/src/loaders/index.js
@@ -9,8 +9,8 @@
  * @namespace PIXI
  */
 module.exports = {
-  //  Loader:     require('resource-loader'),
-    Loader:     require('./Loader'),
+    //  Loader:     require('resource-loader'),
+    Loader:     require('./loader'),
 
     // parsers
     bitmapFontParser:   require('./bitmapFontParser'),
diff --git a/src/text/Text.js b/src/text/Text.js
index 6b43047..08a8c04 100644
--- a/src/text/Text.js
+++ b/src/text/Text.js
@@ -384,7 +384,7 @@
 
         context.font = fontStyle;
 
-        var width = Math.ceil(context.measureText('|Mq').width);
+        var width = Math.ceil(context.measureText('|M�q').width);
         var baseline = Math.ceil(context.measureText('M').width);
         var height = 2 * baseline;
 
@@ -459,8 +459,6 @@
         }
 
         properties.descent = i - baseline;
-        //TODO might need a tweak. kind of a temp fix!
-        properties.descent += 6;
         properties.fontSize = properties.ascent + properties.descent;
 
         Text.fontPropertiesCache[fontStyle] = properties;