diff --git a/ChangeLog b/ChangeLog
index e54040885b..633cd9dfe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 16 11:12:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* object.c (rb_Float): remove underscores between digits.
+
+	* bignum.c (rb_cstr2inum): reject prefix followed by spaces only.
+
+	* class.c (rb_class_inherited): should use Object when no super
+	  class.
+
 Fri Jan 11 05:06:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* class.c (rb_make_metaclass): [new]
diff --git a/bignum.c b/bignum.c
index e80b5b5ab6..f4add5f5f4 100644
--- a/bignum.c
+++ b/bignum.c
@@ -252,8 +252,8 @@ rb_cstr2inum(str, base)
 
 	if (*end == '_') goto bigparse;
 	if (badcheck) {
-	    while (*end && ISSPACE(*end)) end++;
 	    if (end == str) goto bad; /* no number */
+	    while (*end && ISSPACE(*end)) end++;
 	    if (*end) {		      /* trailing garbage */
 	      bad:
 		rb_invalid_str(s, "Integer");
diff --git a/class.c b/class.c
index fac09657fd..f57f53b11b 100644
--- a/class.c
+++ b/class.c
@@ -170,6 +170,7 @@ VALUE
 rb_class_inherited(super, klass)
     VALUE super, klass;
 {
+    if (!super) super = rb_cObject;
     return rb_funcall(super, rb_intern("inherited"), 1, klass);
 }
 
diff --git a/object.c b/object.c
index fc2bd23fef..68a0b824ea 100644
--- a/object.c
+++ b/object.c
@@ -966,7 +966,6 @@ rb_Float(val)
 
 	    q = p = StringValuePtr(val);
 	    while (*p && ISSPACE(*p)) p++;
-	  again:
 	    d = strtod(p, &end);
 	    if (p == end) {
 	      bad:
@@ -975,12 +974,19 @@ rb_Float(val)
 	    if (*end) {
 		if (*end == '_') {
 		    char *buf = ALLOCA_N(char, strlen(p));
-		    char *n = buf, *last;
+		    char *n = buf, *last = p;
 
+		    while (p < end) *n++ = *p++;
 		    while (*p) {
-			if (*p == '_') {
+			if (*p == '_' && (n > buf && ISDIGIT(n[-1]))) {
+			    /* remove underscores between digits */
 			    last = ++p;
-			    continue;
+			    while (*p == '_') ++p;
+			    if (!ISDIGIT(*p)) {
+				while (last < p) *n++ = *last++;
+				continue;
+			    }
+			    last = p;
 			}
 			*n++ = *p++;
 		    }
@@ -989,7 +995,8 @@ rb_Float(val)
 		    if (!*last) goto bad;
 		    *n = '\0';
 		    p = buf;
-		    goto again;
+		    d = strtod(p, &end);
+		    if (p == end) goto bad;
 		}
 		while (*end && ISSPACE(*end)) end++;
 		if (*end) goto bad;