diff --git a/TODO b/TODO
index 63ebfb78d..5121a1c8f 100644
--- a/TODO
+++ b/TODO
@@ -28,11 +28,14 @@ eliminate the need for tcl-lambda.
 * Translators for additional languages; in particular, Perl, Python,
 TCL, Emacs Lisp, and Rexx.
 
-* Clean up declarations of C functions to use a PROTO macro
-for conditional prototypes, instead of explicit conditionals.
-
 * A package for time conversions and formatting.
 
 * Make GDB work with Guile
 
 This would permit programmable debugging and a nice integrated GUI.
+
+
+Low-level things
+
+* Use the SCM trick of tagging environments with immediates (see m_letrec1)
+  to convert source correctly in unmemocopy.
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index db9fe7eaf..23dc2fd92 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,15 @@
+1999-08-04  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
+
+	* eval.c (SCM_CEVAL): Improvements to SCM_IM_DISPATCH and
+	SCM_IM_HASH_DISPATCH.
+
+	* objects.h (SCM_CLASSF_GOOPS_VALID): Added.
+	(scm_si_redfined, scm_si_hashsets): Moved.
+
+	* objects.c (scm_class_of): Use the new SCM_CLASSF_GOOPS_VALID
+	flag which combines type and status info so that the class
+	redefinition protocol has zero cost during normal execution.
+
 1999-08-03  Gary Houston  <ghouston@easynet.co.uk>
 
 	* ports.h (scm_ptob_descriptor): include a write procedure again.