diff --git a/distrib/utils/sysinst/TODO b/distrib/utils/sysinst/TODO
index e26b4d77854d..0292b5670f2a 100644
--- a/distrib/utils/sysinst/TODO
+++ b/distrib/utils/sysinst/TODO
@@ -1,6 +1,30 @@
+Things we should try and do before 1.3 release....
+
+	-- Add wrapper to install() and upgrade().
+	   On abort, unmount any filesystems mounted by sysinst.
+
+	-- check for overlapping to-be-newfs'ed partitions before newfsing.
+	   jump back to disklabel edit if any overlaps found.
+	   needs to  skip getrawpartition() (and  c on i386).
+
+	-- check for already-mouned fileystems before install newfs.
+	   Abort with message.
+
+	-- check for already-moutend fileystems  before upgrade fsck.
+	   (ignore?)
+
+	-- check for already-mounted filesystems before upgrade mount.
+	   Continue, if device mount is where we wanted it?
+
+	    (Jonathan ran into the above 3 by upgrading from a live
+	    system to a scratch disk.  sysinst copied the live /etc/fstab
+	    to the target. The upgrade failed because sysinst wanted
+	    to mount the active system's /usr. Could happen when a
+	    real upgrade aborts, even running from ramdisk root.)
+
 Things to do ....
 
-	-  Things like having config_network()
+	--  Things like having config_network()
            possibly use the information on the fixed disk instead of having
            to ask everything.
 
@@ -13,38 +37,43 @@ Things to do ....
 
         -- Add setting timezone
 
+        -- Set current time and date.
+
+	-- Configure NTP servers, set NTP in rc.conf
+
         -- A little more clean-up of the run_prog suite so things worke
            nicely for all ports.
 
         -- Check-in of files for amiga and other ports that will use
            sysinst for 1.3.
 
-    -- fix "disklabel -r -w" vs. "disklabel -w": I still don't grok why
-        the  -r, and the manpage says it will lose totally on sparcs.
-        Phil, was there some reason to bypass the incore label on i386?
-        Can we jst do "disklabel -w" everywhere?
+	-- fix "disklabel -r -w" vs. "disklabel -w": I still don't grok why
+           the  -r, and the manpage says it will lose totally on sparcs.
+           Phil, was there some reason to bypass the incore label on i386?
+           Can we jst do "disklabel -w" everywhere?
 
-    -- Michael bumped the in-memory disklabel struct up to 16 entries.
-	 Also add  a runtime check in case that grows in future (e.g., slices).
-	 Maybe bump to 32 entries just in case.
+	-- Michael bumped the in-memory disklabel struct up to 16 entries.
+ 	   Also add  a runtime check in case that grows in future 
+	   (e.g., slices).  Maybe bump to 32 entries just in case.
 
-    -- Fix sanity-check message code. It currently gets over-written
-	immediately by the following message.
+	-- Fix sanity-check message code. It currently gets over-written
+	   immediately by the following message.
 
-    --	check for disklabel edits changing active root partition.
-	reject.
+	-- check for disklabel edits changing active root partition.
+	   reject.
 
-    --  check for overlapping to-be-newfs'ed partitions before newfsing.
-	jump back to disklabel edit if any overlaps found.
-	needs to  skip getrawpartition() (and  c on i386).
 
-    --  remove any possibly-stale ld.so.cache files from the target
-        /etc after unpacking sets. Maybe just don't copy ld.so.cache
-        from /etc.old?
+	-- remove any possibly-stale ld.so.cache files from the target
+           /etc after unpacking sets. Maybe just don't copy ld.so.cache
+           from /etc.old?
 
-    --  set rc.configured, or just remind users to edit rc.conf?
+	-- Set rc.configured.
+	   Or at least remind users to edit rc.conf?
 
-    --  If we're doing a fresh install and there's already a label
-	on the disk, maybe use that intsead  of the compiled-in default
-	label?
+	-- If we're doing a fresh install and there's already a label
+	   on the disk, maybe use that intsead  of the compiled-in default
+	   label?
 
+
+	-- symlinks for /tmp (/tmp -> /var/tmp or some such)
+	   Or configure tmp on   mfs.