--- JSON-XS/XS.xs	2007/11/25 19:02:42	1.66
+++ JSON-XS/XS.xs	2008/03/19 00:44:54	1.70
@@ -1002,22 +1002,24 @@
     {
       int len = dec->cur - start;
 
-      // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
+      // special case the rather common 1..5-digit-int case
       if (*start == '-')
         switch (len)
           {
-            case 2: return newSViv (-(                                                      start [1] - '0' *    1));
-            case 3: return newSViv (-(                                     start [1] * 10 + start [2] - '0' *   11));
-            case 4: return newSViv (-(                   start [1] * 100 + start [2] * 10 + start [3] - '0' *  111));
-            case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
+            case 2: return newSViv (-(                                                                          start [1] - '0' *     1));
+            case 3: return newSViv (-(                                                         start [1] * 10 + start [2] - '0' *    11));
+            case 4: return newSViv (-(                                       start [1] * 100 + start [2] * 10 + start [3] - '0' *   111));
+            case 5: return newSViv (-(                    start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' *  1111));
+            case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
           }
       else
         switch (len)
           {
-            case 1: return newSViv (                                                        start [0] - '0' *    1);
-            case 2: return newSViv (                                       start [0] * 10 + start [1] - '0' *   11);
-            case 3: return newSViv (                     start [0] * 100 + start [1] * 10 + start [2] - '0' *  111);
-            case 4: return newSViv (  start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
+            case 1: return newSViv (                                                                            start [0] - '0' *     1);
+            case 2: return newSViv (                                                           start [0] * 10 + start [1] - '0' *    11);
+            case 3: return newSViv (                                         start [0] * 100 + start [1] * 10 + start [2] - '0' *   111);
+            case 4: return newSViv (                      start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' *  1111);
+            case 5: return newSViv (  start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
           }
 
       {
@@ -1459,7 +1461,10 @@
         SvPOK_only (pv);
         Zero (SvPVX (pv), 1, JSON);
         ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
-        XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
+        XPUSHs (sv_2mortal (sv_bless (
+           newRV_noinc (pv),
+           strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
+        )));
 }
 
 void ascii (JSON *self, int enable = 1)
@@ -1496,7 +1501,6 @@
         get_canonical       = F_CANONICAL
         get_space_before    = F_SPACE_BEFORE
         get_space_after     = F_SPACE_AFTER
-        get_pretty          = F_PRETTY
         get_allow_nonref    = F_ALLOW_NONREF
         get_shrink          = F_SHRINK
         get_allow_blessed   = F_ALLOW_BLESSED
@@ -1520,7 +1524,7 @@
         XPUSHs (ST (0));
 }
 
-int get_max_depth (JSON *self)
+U32 get_max_depth (JSON *self)
 	CODE:
         RETVAL = DEC_DEPTH (self->flags);
 	OUTPUT:
@@ -1603,14 +1607,14 @@
 
 PROTOTYPES: ENABLE
 
-void to_json (SV *scalar)
+void encode_json (SV *scalar)
 	PPCODE:
 {
         JSON json = { F_DEFAULT | F_UTF8 };
         XPUSHs (encode_json (scalar, &json));
 }
 
-void from_json (SV *jsonstr)
+void decode_json (SV *jsonstr)
 	PPCODE:
 {
         JSON json = { F_DEFAULT | F_UTF8 };