diff --git a/ChangeLog b/ChangeLog
index 6d73f1999..9dfce9240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-25  Arno W. Peters  <A.W.Peters@ieee.org>
+
+	* src/circuit/sperror.c: Reworked, now much simpler.
+
+	* src/include/inpdefs.h, src/include/sperror.h: Removed redundancy
+	in the definition of function prototypes.
+
 2000-05-06  Arno W. Peters  <A.W.Peters@ieee.org>
 
 	* src/include/fte*: Broken header files into smaller pieces.  This
diff --git a/TODO b/TODO
index bad4ee876..6e3abe1a3 100644
--- a/TODO
+++ b/TODO
@@ -40,3 +40,10 @@ three only slighty differing implementations
 
 Separate frontend commands from supporting code.  Command files
 start with com_*.   Arno is working on this.
+
+Move src/devices/disto into src/maths/partialderiv.  Partial
+derivatives are math functions and should be classified under that
+directory.
+
+Refactor src/circuit/inp2dot.c so that the parser calls subroutines
+for each possible dotcard.