diff --git a/www/sec-check/GNUmakefile.in b/www/sec-check/GNUmakefile.in
index 663c3f30dd0b31d7dd2285e15f6c4d6868b3888d..9352716e5d0c0e7227fc983017280482235ae8a0 100644
--- a/www/sec-check/GNUmakefile.in
+++ b/www/sec-check/GNUmakefile.in
@@ -80,6 +80,7 @@ ld_cookies	= --load-cookies $(COOKIES)
 ld_cookies_subdir = --load-cookies ../$(COOKIES)
 cookie_args	= --keep-session-cookies --no-check-certificate
 wget_args	= -S -k $(cookie_args) $(ld_cookies)
+wget_args_subdir= -S -k $(cookie_args) $(ld_cookies_subdir)
 
 # Log in and create a current cookies.txt file.
 # Args are uid and password.
@@ -120,24 +121,33 @@ fmt_html_args = $(subst $(empty) ,&,$(subst \ ,%20,$(subst \",%22,$(strip $(1)))
 # Post a form via wget and check the returned page.
 # Args are [root],php_infile,[html_outfile],html_args .
 # root defaults to $(sroot) .  html_outfile defaults to php_infile.html .
+outdir = activate.wget
 define wget_post
-	if [ ! -d activate ]; then echo yes; fi
-	root_dir=$(strip $(1)) \
-	php_infile=$(strip $(2)) \
-	html_outfile=$(strip $(3)); \
-	wget $(wget_args) \
-	    -O $${html_outfile:=activate/$(2).html} \
-	    -o activate/$${html_outfile}.log \
-	    --post-data "$(call fmt_html_args, $(4))" \
-	    $${root_dir:-$(sroot)}/$${php_infile} && \
-	if $(success_cmd) $${html_outfile}; then \
-	    echo "* SUCCESS"; \
-	elif $(failure_cmd) $${html_outfile}; then \
-	    (echo "*** FAILURE"; exit 1); \
-	else echo "*** UNKNOWN RESULT"; \
-	fi
+	@ if [ ! -d $(outdir) ]; then mkdir $(outdir); fi
+	@ root_dir=$(strip $(1)) \
+	  php_infile=$(strip $(2)) \
+	  html_outfile=$(strip $(3)); \
+	  post_args="$(call fmt_html_args, $(4))"; \
+	  echo "==== $(outdir) $${root_dir} $${php_infile} $${html_outfile}.html ===="; \
+	  echo "cd $(outdir); wget $(wget_args_subdir) \
+	    -O $${html_outfile:=$(2).html} \
+	    -o $${html_outfile}.log \
+	    --post-data '$${post_args}' \
+	    $${root_dir:-$(sroot)}/$${php_infile}" \
+	    > $(outdir)/$${html_outfile}.cmd; \
+	  sh $(outdir)/$${html_outfile}.cmd; \
+	  if $(success_cmd) $(outdir)/$${html_outfile}; then \
+	      echo "* SUCCESS"; \
+	  elif $(failure_cmd) $(outdir)/$${html_outfile}; then \
+	      (echo "*** FAILURE"; exit 1); \
+	  else echo "*** UNKNOWN RESULT"; \
+	  fi
 endef
 
+# Check results.
+success_cmd = fgrep -f $(SRCDIR)/success.txt
+failure_cmd = fgrep -f $(SRCDIR)/failure.txt
+
 # Send an SQL command to myboss.
 # Commas need to be entered with a variable $(comma).
 comma := ,
@@ -145,7 +155,7 @@ boss_sql = echo "$(strip $(1));" | ssh $(boss) mysql tbdb
 
 #================================================================
 # Activate the newly swapped-in EinE site to turn on as many forms as we can.
-activate_tasks = newproj1 newproj2 approve_proj new_group \
+activate_tasks = new_proj1 new_proj2 approve_proj new_group \
 	  new_user1 new_user2 confirm_user1 approve_user1 \
 	  new_exp1 new_exp2 mod_exp2
 .PHONY:   $(activate_tasks)
@@ -225,7 +235,7 @@ new_user2: logout
             formfields[joining_uid]=$(usr2)\
             formfields[usr_name]=$(subst $(empty) ,\ ,$(name2))\
             formfields[wikiname]=$(subst $(empty) ,,$(name2))\
-            formfields[usr_email]=never.confirm\
+            formfields[usr_email]=never.confirm@nowhere.net\
 	    $(user_common))
 # Pretend the user sent in his e-mail confirmation.
 confirm_user1:
@@ -236,9 +246,10 @@ query_user1:
 	    select uid$(comma) usr_name$(comma) status \
 	      from users where uid='$(usr1)')
 
-# Approve a new user.  (Takes a couple of minutes to run.)  (%24 is $ .)
+# Approve a new user.  (Takes a couple of minutes to run.)  (%24 is "$" .)
 # Gotta log back in after being logged out above.
 approve_user1: ###admin
+	$(login_sys)
 	$(admin_cmd)
 	$(call wget_post,,approveuser.php3,appusr1.html,\
 	    $(usr1)%24%24approval-$(proj1)%2F$(proj1)=approve\
@@ -306,8 +317,12 @@ rej_links	= \
 	.txt,$(top_links),$(showexp_links),$(shownode_links),$(linkmon_links)
 
 # Clear out the wget directories.
-.PHONY:          public.wget admin.wget
-clear_wget_dirs: public.wget admin.wget
+.PHONY:          activate.wget public.wget admin.wget
+clear_wget_dirs: activate.wget public.wget admin.wget
+activate.wget:
+	- rm -rf activate.wget.prev
+	- mv -f activate.wget activate.wget.prev
+	mkdir activate.wget
 public.wget:
 	- rm -rf public.wget.prev
 	- mv -f public.wget public.wget.prev
diff --git a/www/sec-check/admin_files.list b/www/sec-check/admin_files.list
index 6eeecfa73307d80957d8c287059a999c808e408d..28333c354202a0646b96a0786b406934f92fc849 100644
--- a/www/sec-check/admin_files.list
+++ b/www/sec-check/admin_files.list
@@ -1,7 +1,6 @@
 archive_view.php3
 beginexp_html.php3
 boot.php3
-delaycontrol.php3
 deletegroup.php3
 deleteimageid.php3
 deleteosid.php3
@@ -18,7 +17,6 @@ gensslcert.php3
 joinproject.php3
 kb-manage.php3
 kb-search.php3
-linktest.php3
 loadimage.php3
 modifyexp.php3
 moduserinfo.php3
@@ -34,7 +32,6 @@ nscheck_form.php3
 nsgen.php3
 plab_ez.php3
 powertime.php3
-replayexp.php3
 showpubkeys.php3
 showsfskeys.php3
 showsumstats.php3
diff --git a/www/sec-check/admin_forms.list b/www/sec-check/admin_forms.list
index 8a00609a0004723f859b882824039edfbf9cbe7c..100785aa422eaf38fcfe5eb9b2379e4e3d106d23 100644
--- a/www/sec-check/admin_forms.list
+++ b/www/sec-check/admin_forms.list
@@ -15,7 +15,8 @@
 ./myboss.vulnelab.testbed.emulab.net/archive_view.php3?exptidx=8:79:<font size=+1>This is the (Subversion) archive for experiment 8.<br><br></font><form action='https://myboss.vulnelab.testbed.emulab.net/archive_tag.php3' style="float:left; width:33%;" method=get>
 ./myboss.vulnelab.testbed.emulab.net/archive_view.php3?exptidx=8:80:<b><input type=submit name=tag value='Tag Archive'></b><input type=hidden name=exptidx value='8'></form><form action='https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3' style="float:left; width:33%;" method=get><b><input type=submit name=tag value='Show Tags'></b><input type=hidden name=exptidx value='8'></form><form action='https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3' style="float:left; width:33%;" method=get><b><input type=submit name=missing value='Show Missing Files'></b><input type=hidden name=exptidx value='8'></form><iframe width=100% height=800 scrolling=yes src='cvsweb/cvsweb.php3?exptidx=8' border=2></iframe>
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3:116:            </ul></p><br><form name=form1 enctype=multipart/form-data
-./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061003-120217-208_preswapmod:98:<form name=form1 enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=7:T20061121-120618-396_preswapmod:98:<form name=form1 enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061122-041524-229_swapout:98:<form name=form1 enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=emulab-ops,hwdown:98:<form name=form1 enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=emulab-ops,nfree-leases:98:<form name=form1 enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=emulab-ops,oldreserved:98:<form name=form1 enctype=multipart/form-data
@@ -30,11 +31,9 @@
 ./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=cisco5:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=cisco5>
 ./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=cisco8:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=cisco8>
 ./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=ops:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=ops>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc25:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc25>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc37:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc37>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc4:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc4>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?pid=testbed&eid=testexp1:95:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=pid value=testbed>
-./myboss.vulnelab.testbed.emulab.net/delaycontrol.php3?pid=testbed&eid=testexp1:90:<form action='https://myboss.vulnelab.testbed.emulab.net/delaycontrol.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc109:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc109>
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc150:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc150>
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc157:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc157>
 ./myboss.vulnelab.testbed.emulab.net/deletegroup.php3?pid=testproj&gid=testgroup:82:<form action='deletegroup.php3?pid=testproj&amp;gid=testgroup' method=post><b><input type=submit name=confirmed value=Confirm></b>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=emulab-ops-FBSD-RON:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='emulab-ops-FBSD-RON'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-EEIDE-FC2-0915:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-EEIDE-FC2-0915'>
@@ -68,6 +67,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD49-CLEAN:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD49-CLEAN'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD49-STABLE-BOSS'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD49-UPDATE:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD49-UPDATE'>
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-MROUTING:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD54-MROUTING'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-NEWPORTS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD54-NEWPORTS'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-PORTSRC:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD54-PORTSRC'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD60-NEWPORTS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD60-NEWPORTS'>
@@ -90,6 +90,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-EMSTAR:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-EMSTAR'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LBS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LBS'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LBSTOO:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LBSTOO'>
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LINKDELAY:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LINKDELAY'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LT:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LT'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-NEWWIFI:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-NEWWIFI'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-STOLEN:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-STOLEN'>
@@ -117,6 +118,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-SP1-pc3000-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-SP2-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-SP2-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-SP2-pc3000-new'>
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-TMP:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-TMP'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-UPD-pc3000-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPDATE-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-UPDATE-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-UPDATE-sysprep'>
@@ -153,6 +155,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deletepubkey.php3?target_uid=testuser&key=1:82:<form action='deletepubkey.php3?target_uid=testuser&amp;key=1'
 ./myboss.vulnelab.testbed.emulab.net/deletepubkey.php3?target_uid=testuser&key=2:82:<form action='deletepubkey.php3?target_uid=testuser&amp;key=2'
 ./myboss.vulnelab.testbed.emulab.net/deleteuser.php3?target_uid=testuser&target_pid=testproj:81:<form action="https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3" method=post><input type=hidden name=target_uid value="testuser">
+./myboss.vulnelab.testbed.emulab.net/deleteuser.php3?target_uid=testusr2&target_pid=testproj:81:<form action="https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3" method=post><input type=hidden name=target_uid value="testusr2">
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=hwdown:82:          <form action="editexp.php3?pid=emulab-ops&amp;eid=hwdown" method=post>
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=nfree-leases:82:          <form action="editexp.php3?pid=emulab-ops&amp;eid=nfree-leases" method=post>
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=oldreserved:82:          <form action="editexp.php3?pid=emulab-ops&amp;eid=oldreserved" method=post>
@@ -195,6 +198,7 @@
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-CLEAN:80:          <form action='editimageid.php3?imageid=testbed-FBSD49-CLEAN'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS:80:          <form action='editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-UPDATE:80:          <form action='editimageid.php3?imageid=testbed-FBSD49-UPDATE'
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-MROUTING:80:          <form action='editimageid.php3?imageid=testbed-FBSD54-MROUTING'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-NEWPORTS:80:          <form action='editimageid.php3?imageid=testbed-FBSD54-NEWPORTS'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-PORTSRC:80:          <form action='editimageid.php3?imageid=testbed-FBSD54-PORTSRC'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD60-NEWPORTS:80:          <form action='editimageid.php3?imageid=testbed-FBSD60-NEWPORTS'
@@ -217,6 +221,7 @@
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-EMSTAR:80:          <form action='editimageid.php3?imageid=testbed-RHL90-EMSTAR'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBS:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LBS'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBSTOO:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LBSTOO'
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LINKDELAY:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LINKDELAY'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LT:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LT'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-NEWWIFI:80:          <form action='editimageid.php3?imageid=testbed-RHL90-NEWWIFI'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-STOLEN:80:          <form action='editimageid.php3?imageid=testbed-RHL90-STOLEN'
@@ -244,6 +249,7 @@
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-SP2-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new'
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-TMP:80:          <form action='editimageid.php3?imageid=testbed-WINXP-TMP'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-UPDATE-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep:80:          <form action='editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep'
@@ -263,9 +269,9 @@
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=opsnodes:97:<form action='endexp.php3?pid=emulab-ops&amp;eid=opsnodes' method=post><input type=hidden name=exp_pideid value="">
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=reloading:92:<form action='endexp.php3?pid=emulab-ops&amp;eid=reloading' method=post><input type=hidden name=exp_pideid value="">
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=reloadpending:92:<form action='endexp.php3?pid=emulab-ops&amp;eid=reloadpending' method=post><input type=hidden name=exp_pideid value="">
-./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=testbed&eid=testexp1:97:<form action='endexp.php3?pid=testbed&amp;eid=testexp1' method=post><input type=hidden name=exp_pideid value="">
+./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=testbed&eid=testexp1:92:<form action='endexp.php3?pid=testbed&amp;eid=testexp1' method=post><input type=hidden name=exp_pideid value="">
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=testbed&eid=testexp2:100:<form action='endexp.php3?pid=testbed&amp;eid=testexp2' method=post><input type=hidden name=exp_pideid value="">
-./myboss.vulnelab.testbed.emulab.net/feedback.php3?pid=testbed&eid=testexp1&mode=clear:94:<form action="https://myboss.vulnelab.testbed.emulab.net/feedback.php3" method=get><input type=hidden name=pid value=testbed>
+./myboss.vulnelab.testbed.emulab.net/feedback.php3?pid=testbed&eid=testexp1&mode=clear:89:<form action="https://myboss.vulnelab.testbed.emulab.net/feedback.php3" method=get><input type=hidden name=pid value=testbed>
 ./myboss.vulnelab.testbed.emulab.net/feedback.php3?pid=testbed&eid=testexp2&mode=clear:97:<form action="https://myboss.vulnelab.testbed.emulab.net/feedback.php3" method=get><input type=hidden name=pid value=testbed>
 ./myboss.vulnelab.testbed.emulab.net/freenode.php3?node_id=ops:224:<form action='freenode.php3?node_id=ops' method=post><b><input type=submit name=confirmed value=Confirm></b>
 ./myboss.vulnelab.testbed.emulab.net/freezeuser.php3?target_uid=fish&action=freeze:89:<form action="https://myboss.vulnelab.testbed.emulab.net/freezeuser.php3" method=post><input type=hidden name=target_uid value="fish">
@@ -273,7 +279,6 @@
 ./myboss.vulnelab.testbed.emulab.net/joinproject.php3:123:          <form name=myform enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/kb-manage.php3:96:          <form action='kb-manage.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/kb-search.php3:77:          <form action="kb-search.php3" method=get>
-./myboss.vulnelab.testbed.emulab.net/linktest.php3?pid=testbed&eid=testexp1:320:<form action="https://myboss.vulnelab.testbed.emulab.net/linktest.php3" method=post name=myform id=myform><input type=hidden name=pid value=testbed>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=emulab-ops-FBSD-RON:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-EEIDE-FC2-0915:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-EEIDE-RHL90-0827:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -306,6 +311,7 @@
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD49-CLEAN:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD49-STABLE-BOSS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD49-UPDATE:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-MROUTING:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-NEWPORTS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-PORTSRC:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD60-NEWPORTS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -328,6 +334,7 @@
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-EMSTAR:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LBS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LBSTOO:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LINKDELAY:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LT:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-NEWWIFI:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-STOLEN:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -355,6 +362,7 @@
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-SP1-pc3000-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-SP2-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-SP2-pc3000-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-TMP:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPD-pc3000-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPDATE-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPDATE-sysprep:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -372,6 +380,7 @@
 ./myboss.vulnelab.testbed.emulab.net/modifyexp.php3?pid=testbed&eid=testexp2:101:<tr><th colspan=2><font size='+1'><a href='clientui.php3?pid=testbed&amp;eid=testexp2'>GUI Editor</a> - Edit the topology using a Java applet.</font></th></tr><form name='form1' action='https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3?pid=testbed&amp;eid=testexp2&amp;go=1' method='post' onsubmit="return false;" enctype=multipart/form-data><tr><th>Upload new NS file: </th><td><input type=hidden name=MAX_FILE_SIZE value=512000><input type=file name=exp_nsfile size=30 onchange="this.form.syntax.disabled=(this.value=='')" /></td></tr>
 ./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=fish:95:          <form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method=post>
 ./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=testuser:86:          <form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method=post>
+./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=testusr2:86:          <form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method=post>
 ./myboss.vulnelab.testbed.emulab.net/newgroup_form.php3?pid=testproj:78:<form action="https://myboss.vulnelab.testbed.emulab.net/newgroup.php3" method=post>
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=cisco1:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
@@ -380,9 +389,9 @@
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=cisco5:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=cisco8:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=ops:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc25:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc37:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc4:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc109:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc150:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc157:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?nodetype=mote:137:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newmmlist.php3:119:          <form action='newmmlist.php3' method=post name=myform>
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=cisco1:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
@@ -391,9 +400,9 @@
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=cisco5:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=cisco8:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=ops:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc25:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc37:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc4:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc109:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc150:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc157:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/newnodes_list.php3:90:<form action="newnodes_list.php3" method="get" name="nodeform">
 ./myboss.vulnelab.testbed.emulab.net/newosid_form.php3:90:<form action="https://myboss.vulnelab.testbed.emulab.net/newosid.php3" method="post" name=idform>
 ./myboss.vulnelab.testbed.emulab.net/newproject.php3:130:          <form enctype=multipart/form-data name=myform
@@ -403,9 +412,9 @@
 ./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=cisco5:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
 ./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=cisco8:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
 ./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=ops:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc25:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc37:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc4:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc109:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc150:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc157:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
 ./myboss.vulnelab.testbed.emulab.net/nscheck_form.php3:88:<form enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plabdevbox:98:<form name='form1' action='https://myboss.vulnelab.testbed.emulab.net/nsgen.php3' method='get'>
 ./myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plinabox:97:<form name='form1' action='https://myboss.vulnelab.testbed.emulab.net/nsgen.php3' method='get'>
@@ -416,14 +425,15 @@
 ./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=cisco5:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
 ./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=cisco8:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
 ./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=ops:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc25:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc37:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc4:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/replayexp.php3?&pid=testbed&eid=testexp1:94:<form action='https://myboss.vulnelab.testbed.emulab.net/replayexp.php3?pid=testbed&amp;eid=testexp1'
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc109:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc150:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc157:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
 ./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=fish:212:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=testuser:128:          <form enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=testusr2:95:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=fish:100:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=testuser:91:          <form enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=testusr2:91:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=projects&sortby=edays&range=day:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=projects&sortby=edays&range=month:91:            Week</a>, Month, </b><form action="showsumstats.php3" method=get>
@@ -483,12 +493,7 @@
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=users&sortby=uid:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=users:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showuser_list.php3:94:<form action="showuser_list.php3" method=post>
+./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp1:89:<form action='swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp1'
 ./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp2:97:<form action='swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp2'
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=out&pid=testbed&eid=testexp1:94:<form action='swapexp.php3?inout=out&amp;pid=testbed&amp;eid=testexp1'
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=restart&pid=testbed&eid=testexp1:94:<form action='swapexp.php3?inout=restart&amp;pid=testbed&amp;eid=testexp1'
 ./myboss.vulnelab.testbed.emulab.net/template_create.php:87:<form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=emulab-ops&eid=opsnodes&nodeid=ops:100:<form action='https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=emulab-ops&amp;eid=opsnodes' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc25:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc37:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc4:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
diff --git a/www/sec-check/admin_inputs.list b/www/sec-check/admin_inputs.list
index b601d795237455c51191e5f2eecfedd35403e5ac..ac7cada0465cff76e970a7ec1afff29bd4d159db 100644
--- a/www/sec-check/admin_inputs.list
+++ b/www/sec-check/admin_inputs.list
@@ -230,7 +230,7 @@
 <input type="checkbox" name="formfields[exp_preload]" value='Yep' >
 <input type="button" name="beginexp" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061003-120217-208_preswapmod
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=7:T20061121-120618-396_preswapmod
 <form name=form1 enctype=multipart/form-data action="beginexp_html.php3" method="post">
 <input type="hidden" name="beginexp" value="Submit" >
 <input type="select" name="formfields[exp_pid]" value=''>
@@ -238,7 +238,29 @@
 <input type="text" name="formfields[exp_id]" value="testexp2-Copy0" size=19 maxlength=19>
 <input type="text" name="formfields[exp_description]" value="testexp2 experiment." size=60>
 <input type="checkbox" name="formfields[exp_branch]" value='1' >
-<input type="hidden" name="formfields[copyid]" value='8:T20061003-120217-208_preswapmod' >
+<input type="hidden" name="formfields[copyid]" value='7:T20061121-120618-396_preswapmod' >
+<input type="hidden" name="formfields[exp_swappable]" value='1' >
+<input type="hidden" name="formfields[exp_noswap_reason]" value=''>
+<input type="checkbox" name="formfields[exp_idleswap]" value='1' checked='1'>
+<input type="text" name="formfields[exp_idleswap_timeout]" value='4' size='3'>
+<input type="textarea" name="formfields[exp_noidleswap_reason]" rows=2 cols=50 >
+<input type="checkbox" name="formfields[exp_autoswap]" value='1' checked='1'>
+<input type="text" name="formfields[exp_autoswap_timeout]" value='16' size='3'>
+<input type="checkbox" name="formfields[exp_savedisk]" value='Yep' >
+<input type="select" name="formfields[exp_linktest]" value="0" >
+<input type="checkbox" name="formfields[exp_batched]" value='Yep' >
+<input type="checkbox" name="formfields[exp_preload]" value='Yep' >
+<input type="button" name="beginexp" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061122-041524-229_swapout
+<form name=form1 enctype=multipart/form-data action="beginexp_html.php3" method="post">
+<input type="hidden" name="beginexp" value="Submit" >
+<input type="select" name="formfields[exp_pid]" value=''>
+<input type="select" name="formfields[exp_gid]" value=''>
+<input type="text" name="formfields[exp_id]" value="testexp1-Copy0" size=19 maxlength=19>
+<input type="text" name="formfields[exp_description]" value="testexp1 experiment." size=60>
+<input type="checkbox" name="formfields[exp_branch]" value='1' >
+<input type="hidden" name="formfields[copyid]" value='8:T20061122-041524-229_swapout' >
 <input type="hidden" name="formfields[exp_swappable]" value='1' >
 <input type="hidden" name="formfields[exp_noswap_reason]" value=''>
 <input type="checkbox" name="formfields[exp_idleswap]" value='1' checked='1'>
@@ -464,39 +486,24 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="node_id" value="pc25" >
+<input type="hidden" name="node_id" value="pc109" >
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="node_id" value="pc37" >
+<input type="hidden" name="node_id" value="pc150" >
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="node_id" value="pc4" >
+<input type="hidden" name="node_id" value="pc157" >
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="pid" value="testbed" >
-<input type="hidden" name="eid" value="testexp1" >
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
-./myboss.vulnelab.testbed.emulab.net/delaycontrol.php3?pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/delaycontrol.php3" method="post">
-<input type="hidden" name="dochange" value="1" />
-<input type="hidden" name="eid" value='testexp1' />
-<input type="hidden" name="pid" value='testbed' />
-<input type="checkbox" name="modbase" value="1" >
-<input type="submit" value='Execute' >
-
 ./myboss.vulnelab.testbed.emulab.net/deletegroup.php3?pid=testproj&gid=testgroup
 <form action="deletegroup.php3?pid=testproj&amp;gid=testgroup" method="post">
 <input type="submit" name="confirmed" value="Confirm" >
@@ -694,6 +701,12 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-MROUTING
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
+<input type="hidden" name="imageid" value='testbed-FBSD54-MROUTING' >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-NEWPORTS
 <form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
 <input type="hidden" name="imageid" value='testbed-FBSD54-NEWPORTS' >
@@ -826,6 +839,12 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LINKDELAY
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
+<input type="hidden" name="imageid" value='testbed-RHL90-LINKDELAY' >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LT
 <form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
 <input type="hidden" name="imageid" value='testbed-RHL90-LT' >
@@ -988,6 +1007,12 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-TMP
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
+<input type="hidden" name="imageid" value='testbed-WINXP-TMP' >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new
 <form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
 <input type="hidden" name="imageid" value='testbed-WINXP-UPD-pc3000-new' >
@@ -1195,6 +1220,13 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteuser.php3?target_uid=testusr2&target_pid=testproj
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3" method="post">
+<input type="hidden" name="target_uid" value="testusr2" >
+<input type="hidden" name="target_pid" value="testproj" >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=hwdown
 <form action="editexp.php3?pid=emulab-ops&amp;eid=hwdown" method="post">
 <input type="text" name="formfields[description]" value='Node reported as down - DO NOT DELETE' size=30>
@@ -1323,658 +1355,679 @@
 <form action="editimageid.php3?imageid=emulab-ops-FBSD-RON" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RON FreeBSD Image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-RON.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-FC2-0915
 <form action="editimageid.php3?imageid=testbed-EEIDE-FC2-0915" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Fedora Core 2 test, Sep 15" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-FC2-0915.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-RHL90-0827
 <form action="editimageid.php3?imageid=testbed-EEIDE-RHL90-0827" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Red Hat Linux 9 test image, Aug 27" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-RHL90-0827.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-RHL90-BASE
 <form action="editimageid.php3?imageid=testbed-EEIDE-RHL90-BASE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Base RHL90 image, created from Red Hat 9.0 CDs" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-RHL90-BASE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-SF
 <form action="editimageid.php3?imageid=testbed-EEIDE-SF" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 with SmartFrog 3.08" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-SF.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-45-ISS0
 <form action="editimageid.php3?imageid=testbed-FBSD-45-ISS0" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.5 with an Initial Sequence Number of 0" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-45-ISS0.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-BOSSCLONE
 <form action="editimageid.php3?imageid=testbed-FBSD-BOSSCLONE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A boss impostor" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-BOSSCLONE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-LT
 <form action="editimageid.php3?imageid=testbed-FBSD-LT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="freebsd with new linktest" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-LT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-PARTIALBOSS
 <form action="editimageid.php3?imageid=testbed-FBSD-PARTIALBOSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Partially-completed boss install" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-PARTIALBOSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-PARTIALOPS
 <form action="editimageid.php3?imageid=testbed-FBSD-PARTIALOPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Partially-completed ops install" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-PARTIALOPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-RON+FBSD47-WITHSRC
 <form action="editimageid.php3?imageid=testbed-FBSD-RON+FBSD47-WITHSRC" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RON Image on slice 1, FBSD47 on slice 2 and bootable, CDROM boot on slice 3" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-RON+FBSD47+CDBOOT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST2
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Another test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST3
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST3" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Another test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST3.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST4
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST4" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Another FreeBSD test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST4.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Just a test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD10+RHL90-ElabInElab
 <form action="editimageid.php3?imageid=testbed-FBSD10+RHL90-ElabInElab" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Moderately hacked images for ElabInElab" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD10+RHL90-ElabInElab.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-CLEAN
 <form action="editimageid.php3?imageid=testbed-FBSD410-CLEAN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A clean FreeBSD 4.10 disk image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD410-CLEAN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-FORBOSS
 <form action="editimageid.php3?imageid=testbed-FBSD410-FORBOSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.10 with boss ports installed" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD410-FORBOSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-FOROPS
 <form action="editimageid.php3?imageid=testbed-FBSD410-FOROPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.10 with ops ports installed" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD410-FOROPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-LBS
 <form action="editimageid.php3?imageid=testbed-FBSD410-LBS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Nothing special" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD410-LBS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-TMP
 <form action="editimageid.php3?imageid=testbed-FBSD410-TMP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="temp" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD410-TMP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD411-BAREBONES
 <form action="editimageid.php3?imageid=testbed-FBSD411-BAREBONES" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FBSD411-CLEAN with client install" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD411-BAREBONES.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD411-CLEAN
 <form action="editimageid.php3?imageid=testbed-FBSD411-CLEAN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A clean FreeBSD 4.11 disk image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD411-CLEAN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD411-SERVER
 <form action="editimageid.php3?imageid=testbed-FBSD411-SERVER" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.11 for boss/ops node" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD411-SERVER.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD45-BOSSNODE
 <form action="editimageid.php3?imageid=testbed-FBSD45-BOSSNODE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Base image (without any localized information) of a boss node" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD45-BOSSNODE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47+RHL73-UPDATE
 <form action="editimageid.php3?imageid=testbed-FBSD47+RHL73-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.7 and Redhat 7.3 update image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD47+RHL73-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47-CLEANOPS
 <form action="editimageid.php3?imageid=testbed-FBSD47-CLEANOPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Clean (no local customization) ops node image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD47-CLEANOPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47-UPDATE
 <form action="editimageid.php3?imageid=testbed-FBSD47-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.7 update image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD47-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47-onslice2of-RON
 <form action="editimageid.php3?imageid=testbed-FBSD47-onslice2of-RON" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FBSD47 withsrc for slice2 of RON Image only" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD47-onslice2of-RON.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-CLEAN
 <form action="editimageid.php3?imageid=testbed-FBSD49-CLEAN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A clean installation of FreeBSD 4.9" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD49-CLEAN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS
 <form action="editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A proto-boss image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD49-STABLE-BOSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-UPDATE
 <form action="editimageid.php3?imageid=testbed-FBSD49-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.9 update image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD49-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-MROUTING
+<form action="editimageid.php3?imageid=testbed-FBSD54-MROUTING" method="post" name=idform>
+<input type="text" name="formfields[description]" value="FreeBSD 5.4 + MROUTING option enabled" size=50>
+<input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD54-MROUTING.ndz" size=50>
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-NEWPORTS
 <form action="editimageid.php3?imageid=testbed-FBSD54-NEWPORTS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 5.4 with new base ports, working on Emulab ports" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD54-NEWPORTS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-PORTSRC
 <form action="editimageid.php3?imageid=testbed-FBSD54-PORTSRC" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 5.4 with ports ungraded to current and source" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD54-PORTSRC.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD60-NEWPORTS
 <form action="editimageid.php3?imageid=testbed-FBSD60-NEWPORTS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 6.0 with new ports installed" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD60-NEWPORTS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD61-STD
 <form action="editimageid.php3?imageid=testbed-FBSD61-STD" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Standard FBSD6.1 image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD61-STD.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD7-TEST
 <form action="editimageid.php3?imageid=testbed-FBSD7-TEST" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 7 (CURRENT) test image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD7-TEST.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FC4-ANDRE
 <form action="editimageid.php3?imageid=testbed-FC4-ANDRE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 image with updated kernel from ReplicaTools project - testing" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FC4-UPDATE-2.6.17.7.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FC4-EVAL
 <form action="editimageid.php3?imageid=testbed-FC4-EVAL" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 updated to work on the eval Dell boxes" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FC4-EVAL.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FC4-LBS
 <form action="editimageid.php3?imageid=testbed-FC4-LBS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 image, nothing special about it" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FC4-LBS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-LBS-DELAY
 <form action="editimageid.php3?imageid=testbed-LBS-DELAY" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing minor changes to dummynet" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/LBS-DELAY.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-MIKEFOO
 <form action="editimageid.php3?imageid=testbed-MIKEFOO" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Mike Foo Image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/MIKEFOO.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-MIKES-WORLD
 <form action="editimageid.php3?imageid=testbed-MIKES-WORLD" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Mike FreeBSD 4.7 build environment" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/MIKES-WORLD.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-MyCutsomImage
 <form action="editimageid.php3?imageid=testbed-MyCutsomImage" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Roopesh's custom image." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/roop_gateway.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-OBSD-TMP
 <form action="editimageid.php3?imageid=testbed-OBSD-TMP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="OpenBSD prototype" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/OBSD-TMP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL-NETPERF
 <form action="editimageid.php3?imageid=testbed-RHL-NETPERF" method="post" name=idform>
 <input type="text" name="formfields[description]" value="standard rhl with netperf installed and netserver running on startup" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL-NETPERF.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEMP
 <form action="editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEMP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Temp image until leigh gets a chance to look at it" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-IXPHOST-TEMP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEST
 <form action="editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEST" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing some changes to the ixphost image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-IXPHOST-TEST.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-UPDATE2
 <form action="editimageid.php3?imageid=testbed-RHL73-UPDATE2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 7.3 update image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-UPDATE2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-UPDATE
 <form action="editimageid.php3?imageid=testbed-RHL73-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 7.3 update image - Not for public use" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/RHL73-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-VSERV
 <form action="editimageid.php3?imageid=testbed-RHL73-VSERV" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testbed RHL73 image with vserver patched kernel and vtun" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-VSERV.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-EMSTAR
 <form action="editimageid.php3?imageid=testbed-RHL90-EMSTAR" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RHL90-WIRELESS with emstar installed and configured" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-EMSTAR.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBS
 <form action="editimageid.php3?imageid=testbed-RHL90-LBS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RedHat 9.0 with wireless support" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/RHL90-LBS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBSTOO
 <form action="editimageid.php3?imageid=testbed-RHL90-LBSTOO" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 9.0 image, nothing special about it." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-LBSTOO." size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LINKDELAY
+<form action="editimageid.php3?imageid=testbed-RHL90-LINKDELAY" method="post" name=idform>
+<input type="text" name="formfields[description]" value="Link delay test and build image" size=50>
+<input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-LINKDELAY.ndz" size=50>
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LT
 <form action="editimageid.php3?imageid=testbed-RHL90-LT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="redhat with new linktest stuff" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-LT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-NEWWIFI
 <form action="editimageid.php3?imageid=testbed-RHL90-NEWWIFI" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Image with new madwifi-ng driver" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-NEWWIFI.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-STOLEN
 <form action="editimageid.php3?imageid=testbed-RHL90-STOLEN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Sai's 9.0 image borrowed for compiling stuff" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-STOLEN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-UPDATE
 <form action="editimageid.php3?imageid=testbed-RHL90-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 9.0 Update image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-USRP
 <form action="editimageid.php3?imageid=testbed-RHL90-USRP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RedHat 9.0 with USRP software" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-USRP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS-2
 <form action="editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS-2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="With gcc-3.3.2 toolchain" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-XSCALE-CROSS-2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS
 <form action="editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RHL9 image with xscale (ARM) cross compiler toolchain" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-XSCALE-CROSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-TOSSurge
 <form action="editimageid.php3?imageid=testbed-TOSSurge" method="post" name=idform>
 <input type="text" name="formfields[description]" value="TinyOS Surge kernel" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/TOSSurge.exe" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-UMASS-BOSSOPS2
 <form action="editimageid.php3?imageid=testbed-UMASS-BOSSOPS2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Half-done attempt to make a combined boss/ops image for UMass" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/UMASS-BOSSOPS2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-UMASS-BOSSOPS
 <form action="editimageid.php3?imageid=testbed-UMASS-BOSSOPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Half-done attempt to make a combined boss/ops node for umass" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/UMASS-BOSSOPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-02-16
 <form action="editimageid.php3?imageid=testbed-WINXP-02-16" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-10-24
 <form action="editimageid.php3?imageid=testbed-WINXP-10-24" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-12-08
 <form action="editimageid.php3?imageid=testbed-WINXP-12-08" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP1-cygwn
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP1-cygwn" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, with SP1a and Cygwin added, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP1-cygwn.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP1
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP1" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, with SP1a added, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP1.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP2-3000
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP2-3000" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install for the PC3000, with SP2 and Windows Update." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP2-3000.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP2-cygwn
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP2-cygwn" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, with Cygwin and SP2 added, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP2-cygwn.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-pc3000
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-pc3000" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare MSDN Windows XP 2001, pc3000 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-pc3000.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-CURRENT
 <form action="editimageid.php3?imageid=testbed-WINXP-CURRENT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE-pc3000." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE-pc3000.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-PPT
 <form action="editimageid.php3?imageid=testbed-WINXP-PPT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="WIndows XP update image with Powerpoint installed" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-PPT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP0-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP0-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP0-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP0-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP0-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP0-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP0-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP0-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP1-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP1-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value=" Testing new SP1-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP1-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP1-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP1-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP2-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP2-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP2-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP2-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP2-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-TMP
+<form action="editimageid.php3?imageid=testbed-WINXP-TMP" method="post" name=idform>
+<input type="text" name="formfields[description]" value="Temporary WINXP image for testing." size=50>
+<input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-TMP.ndz" size=50>
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new UPDATE-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-new
 <form action="editimageid.php3?imageid=testbed-WINXP-UPDATE-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new UPDATE-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep
 <form action="editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Try making a hardware independent image with SysPrep." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-UPDATE-sysprep.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-XPizzo4
 <form action="editimageid.php3?imageid=testbed-XPizzo4" method="post" name=idform>
 <input type="text" name="formfields[description]" value="copy of ITIS6167/XPizzo4" size=50>
 <input type="text" name="formfields[path]" value="/groups/testbed/windows/images/XPizzo4.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-XPizzo
 <form action="editimageid.php3?imageid=testbed-XPizzo" method="post" name=idform>
 <input type="text" name="formfields[description]" value="copy of ITIS6167/XPizzo" size=50>
 <input type="text" name="formfields[path]" value="/groups/testbed/windows/images/XPizzo.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-fc3-proto
 <form action="editimageid.php3?imageid=testbed-fc3-proto" method="post" name=idform>
 <input type="text" name="formfields[description]" value="fc3" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/fc3-proto.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-linux-2.4.9-click
 <form action="editimageid.php3?imageid=testbed-linux-2.4.9-click" method="post" name=idform>
 <input type="text" name="formfields[description]" value="linux version 2.4.9 with click modifications" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/linux-2.4.9-click.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-motdisk
 <form action="editimageid.php3?imageid=testbed-motdisk" method="post" name=idform>
 <input type="text" name="formfields[description]" value="speaical motd" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/motdisk.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-robtest
 <form action="editimageid.php3?imageid=testbed-robtest" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Rob's test image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/robtest.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_winxp_base
 <form action="editimageid.php3?imageid=testbed-russ_winxp_base" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Base WinXP image that Russ maintains" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/russ_winxp_base.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_xp_test2
 <form action="editimageid.php3?imageid=testbed-russ_xp_test2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/russ_xp_test2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_xp_test3
 <form action="editimageid.php3?imageid=testbed-russ_xp_test3" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing. " size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/russ_xp_test3.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_xp_test
 <form action="editimageid.php3?imageid=testbed-russ_xp_test" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Test XP image loading." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/russ_xp_test.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=hwdown
@@ -2091,13 +2144,6 @@
 <input type="radio" name="query_which" value="both" checked >
 <input type="submit" name="submit" value='Submit Query' >
 
-./myboss.vulnelab.testbed.emulab.net/linktest.php3?pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/linktest.php3" method="post" name=myform id=myform>
-<input type="hidden" name="pid" value="testbed" >
-<input type="hidden" name="eid" value="testexp1" >
-<input type="select" name="level" value="0" >
-<input type="button" name="action" value="Start" id=action >
-
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=emulab-ops-FBSD-RON
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2290,6 +2336,12 @@
 <input type="hidden" name="imageid" value='testbed-FBSD49-UPDATE' >
 <input type="submit" name="submit" value='Go!' >
 
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-MROUTING
+<form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
+<input type="text" name="node" value=''>
+<input type="hidden" name="imageid" value='testbed-FBSD54-MROUTING' >
+<input type="submit" name="submit" value='Go!' >
+
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-NEWPORTS
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2422,6 +2474,12 @@
 <input type="hidden" name="imageid" value='testbed-RHL90-LBSTOO' >
 <input type="submit" name="submit" value='Go!' >
 
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LINKDELAY
+<form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
+<input type="text" name="node" value=''>
+<input type="hidden" name="imageid" value='testbed-RHL90-LINKDELAY' >
+<input type="submit" name="submit" value='Go!' >
+
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LT
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2584,6 +2642,12 @@
 <input type="hidden" name="imageid" value='testbed-WINXP-SP2-pc3000-new' >
 <input type="submit" name="submit" value='Go!' >
 
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-TMP
+<form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
+<input type="text" name="node" value=''>
+<input type="hidden" name="imageid" value='testbed-WINXP-TMP' >
+<input type="submit" name="submit" value='Go!' >
+
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPD-pc3000-new
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2668,8 +2732,6 @@
 <input type="file" name="exp_nsfile" size=30 />
 <input type="text" name="formfields[exp_localnsfile]" size=40 />
 <input type="textarea" name="nsdata" cols='100' rows='40' >
-<input type="checkbox" name="reboot" value='1' checked='1'>
-<input type="checkbox" name="eventrestart" value='1' checked='1'>
 <input type="submit" name="syntax" value='Syntax Check' disabled id=syntax >
 <input type="reset" >
 
@@ -2724,7 +2786,30 @@
 <input type="text" name="formfields[usr_phone]" value="(801) 123-4567" size=15>
 <input type="password" name="formfields[password1]" size=8>
 <input type="password" name="formfields[password2]" size=8>
-<input type="text" name="formfields[w_password1]" value="ES8/3asW" size=8>
+<input type="text" name="formfields[w_password1]" value="PK0kPw.z" size=8>
+<input type="text" name="formfields[w_password2]" size=8>
+<input type="checkbox" name="formfields[user_interface]" value="plab" >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=testusr2
+<form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method="post">
+<input type="hidden" name="formfields[target_uid]" value="testusr2" size=8 maxlength=8>
+<input type="text" name="formfields[usr_name]" value="Test User 2" size=30>
+<input type="text" name="formfields[usr_title]" value="Tester" size=30>
+<input type="text" name="formfields[usr_affil]" value="Emulab Scripts" size=40>
+<input type="text" name="formfields[usr_URL]" value="http://www.emulab.net" size=45>
+<input type="hidden" name="formfields[usr_email]" value="never.confirm@nowhere.net" size=30>
+<input type="text" name="formfields[usr_addr]" value="Silly" size=45>
+<input type="text" name="formfields[usr_addr2]" value="Address" size=45>
+<input type="text" name="formfields[usr_city]" value="Salt Lake Silly" size=25>
+<input type="text" name="formfields[usr_state]" value="UT" size=2>
+<input type="text" name="formfields[usr_zip]" value="12345" size=10>
+<input type="text" name="formfields[usr_country]" value="USA" size=15>
+<input type="select" name="formfields[usr_shell]" value='sh' >
+<input type="text" name="formfields[usr_phone]" value="(801) 123-4567" size=15>
+<input type="password" name="formfields[password1]" size=8>
+<input type="password" name="formfields[password2]" size=8>
+<input type="text" name="formfields[w_password1]" value="B0zddh.B" size=8>
 <input type="text" name="formfields[w_password2]" size=8>
 <input type="checkbox" name="formfields[user_interface]" value="plab" >
 <input type="submit" name="submit" value="Submit" >
@@ -2754,7 +2839,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2777,7 +2862,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2800,7 +2885,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2823,7 +2908,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2846,7 +2931,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2869,7 +2954,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2892,13 +2977,13 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc25
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc109
 <form action="newimageid_ez.php3" enctype="multipart/form-data" method="post" name=idform>
 <input type="select" name="formfields[pid]" value=''>
 <input type="select" name="formfields[gid]" value=''>
@@ -2908,20 +2993,20 @@
 <input type="select" name="formfields[os_name]" value="none" >
 <input type="text" name="formfields[os_version]" value="" size=12 maxlength=12>
 <input type="text" name="formfields[path]" value="/proj/" size=50>
-<input type="text" name="formfields[node]" value="pc25" size=10 maxlength=10>
+<input type="text" name="formfields[node]" value="pc109" size=10 maxlength=10>
 <input type="checkbox" name="formfields[os_feature_ping]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ssh]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ipod]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc37
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc150
 <form action="newimageid_ez.php3" enctype="multipart/form-data" method="post" name=idform>
 <input type="select" name="formfields[pid]" value=''>
 <input type="select" name="formfields[gid]" value=''>
@@ -2931,20 +3016,20 @@
 <input type="select" name="formfields[os_name]" value="none" >
 <input type="text" name="formfields[os_version]" value="" size=12 maxlength=12>
 <input type="text" name="formfields[path]" value="/proj/" size=50>
-<input type="text" name="formfields[node]" value="pc37" size=10 maxlength=10>
+<input type="text" name="formfields[node]" value="pc150" size=10 maxlength=10>
 <input type="checkbox" name="formfields[os_feature_ping]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ssh]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ipod]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc4
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc157
 <form action="newimageid_ez.php3" enctype="multipart/form-data" method="post" name=idform>
 <input type="select" name="formfields[pid]" value=''>
 <input type="select" name="formfields[gid]" value=''>
@@ -2954,14 +3039,14 @@
 <input type="select" name="formfields[os_name]" value="none" >
 <input type="text" name="formfields[os_version]" value="" size=12 maxlength=12>
 <input type="text" name="formfields[path]" value="/proj/" size=50>
-<input type="text" name="formfields[node]" value="pc4" size=10 maxlength=10>
+<input type="text" name="formfields[node]" value="pc157" size=10 maxlength=10>
 <input type="checkbox" name="formfields[os_feature_ping]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ssh]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ipod]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -3034,23 +3119,23 @@
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3" method="post">
-<input type="text" name="node_id" value="pc25" size=10 maxlength=10>
+<input type="text" name="node_id" value="pc109" size=10 maxlength=10>
 <input type="select" name="log_type" value='misc' >
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3" method="post">
-<input type="text" name="node_id" value="pc37" size=10 maxlength=10>
+<input type="text" name="node_id" value="pc150" size=10 maxlength=10>
 <input type="select" name="log_type" value='misc' >
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3" method="post">
-<input type="text" name="node_id" value="pc4" size=10 maxlength=10>
+<input type="text" name="node_id" value="pc157" size=10 maxlength=10>
 <input type="select" name="log_type" value='misc' >
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
@@ -3178,36 +3263,33 @@
 <input type="text" name="tarballs" size="60" maxlength="1024" value="">
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer=" method="post">
-<input type="text" name="node_id" value="pc25" readonly >
-<input type="text" name="vname" value='node2' readonly >
-<input type="text" name="node_type" value="pc600" readonly >
-<input type="select" name="def_boot_osid" value='emulab-ops-RHL90-STD' >
+<input type="text" name="node_id" value="pc109" readonly >
+<input type="text" name="node_type" value="pc850" readonly >
+<input type="select" name="def_boot_osid" value='emulab-ops-FBSD410-STD' >
 <input type="text" name="def_boot_cmd_line" size="40" value="">
 <input type="text" name="startupcmd" size="60" maxlength="256" value=''>
 <input type="text" name="rpms" size="60" maxlength="1024" value="">
 <input type="text" name="tarballs" size="60" maxlength="1024" value="">
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer=" method="post">
-<input type="text" name="node_id" value="pc37" readonly >
-<input type="text" name="vname" value='tbsdelay0' readonly >
-<input type="text" name="node_type" value="pc600" readonly >
+<input type="text" name="node_id" value="pc150" readonly >
+<input type="text" name="node_type" value="pc850" readonly >
 <input type="select" name="def_boot_osid" value='emulab-ops-FBSD410-STD' >
-<input type="text" name="def_boot_cmd_line" value="/kernel.delay" size="40" >
+<input type="text" name="def_boot_cmd_line" size="40" value="">
 <input type="text" name="startupcmd" size="60" maxlength="256" value=''>
 <input type="text" name="rpms" size="60" maxlength="1024" value="">
 <input type="text" name="tarballs" size="60" maxlength="1024" value="">
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer=" method="post">
-<input type="text" name="node_id" value="pc4" readonly >
-<input type="text" name="vname" value='node1' readonly >
-<input type="text" name="node_type" value="pc600" readonly >
-<input type="select" name="def_boot_osid" value='emulab-ops-RHL90-STD' >
+<input type="text" name="node_id" value="pc157" readonly >
+<input type="text" name="node_type" value="pc850" readonly >
+<input type="select" name="def_boot_osid" value='emulab-ops-FBSD410-STD' >
 <input type="text" name="def_boot_cmd_line" size="40" value="">
 <input type="text" name="startupcmd" size="60" maxlength="256" value=''>
 <input type="text" name="rpms" size="60" maxlength="1024" value="">
@@ -3287,29 +3369,24 @@
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/powertime.php3" method="get">
-<input type="checkbox" name="nodes[]" value="pc25" checked>
+<input type="checkbox" name="nodes[]" value="pc109" checked>
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/powertime.php3" method="get">
-<input type="checkbox" name="nodes[]" value="pc37" checked>
+<input type="checkbox" name="nodes[]" value="pc150" checked>
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/powertime.php3" method="get">
-<input type="checkbox" name="nodes[]" value="pc4" checked>
+<input type="checkbox" name="nodes[]" value="pc157" checked>
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/replayexp.php3?&pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/replayexp.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
 ./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=fish
 <form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3" method="post">
 <input type="hidden" name="formfields[target_uid]" value="fish" >
@@ -3327,6 +3404,15 @@
 <input type="password" name="formfields[password]" size=12>
 <input type="submit" name="submit" value='Add New Keys' >
 
+./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=testusr2
+<form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3" method="post">
+<input type="hidden" name="formfields[target_uid]" value="testusr2" >
+<input type="hidden" name="MAX_FILE_SIZE" value="4096" >
+<input type="file" name="usr_keyfile" value="" size=50>
+<input type="text" name="formfields[usr_key]" value="" size=50 maxlength=1024>
+<input type="password" name="formfields[password]" size=12>
+<input type="submit" name="submit" value='Add New Keys' >
+
 ./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=fish
 <form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3" method="post">
 <input type="hidden" name="formfields[target_uid]" value="fish" >
@@ -3340,6 +3426,13 @@
 <input type="password" name="formfields[password]" size=8>
 <input type="submit" name="submit" value='Add New Key' >
 
+./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=testusr2
+<form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3" method="post">
+<input type="hidden" name="formfields[target_uid]" value="testusr2" >
+<input type="text" name="formfields[usr_key]" value="" size=70 maxlength=1024>
+<input type="password" name="formfields[password]" size=8>
+<input type="submit" name="submit" value='Add New Key' >
+
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3
 <form action="showsumstats.php3" method="get">
 <input type="text" name="range" value="mm/dd/yy-mm/dd/yy" >
@@ -3753,18 +3846,13 @@
 <input type="hidden" name="sortby" value="uid" >
 <input type="submit" name="search" value="Search" >
 
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp2
-<form action="swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp2" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=out&pid=testbed&eid=testexp1
-<form action="swapexp.php3?inout=out&amp;pid=testbed&amp;eid=testexp1" method="post">
+./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp1
+<form action="swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp1" method="post">
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=restart&pid=testbed&eid=testexp1
-<form action="swapexp.php3?inout=restart&amp;pid=testbed&amp;eid=testexp1" method="post">
+./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp2
+<form action="swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp2" method="post">
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
@@ -3785,26 +3873,3 @@
 <input type="submit" name="canceled" value="Cancel" >
 <input type="hidden" name="nodeid" value="ops" >
 
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc25
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-<input type="hidden" name="nodeid" value="pc25" >
-
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc37
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-<input type="hidden" name="nodeid" value="pc37" >
-
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc4
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-<input type="hidden" name="nodeid" value="pc4" >
-
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
diff --git a/www/sec-check/failure.txt b/www/sec-check/failure.txt
index e246bcd8fe04ec853114d1eca16d1a995190b000..80dfcdab2d0bb0808fa04731fb5c4ea7011c7c92 100644
--- a/www/sec-check/failure.txt
+++ b/www/sec-check/failure.txt
@@ -1,12 +1,28 @@
 Invalid form arguments
 Invalid page arguments
+Invalid node name
 No tags
 Could not continue
 You are not authorized
+Oops
 please fix the following errors
 Must select at least one type
 You do not appear to be logged in
 Improper query type
 is not a valid
+Missing Field
 Missing field
-
+Not Selected
+Already in use
+Select another
+No default
+Experiment is running or in transition
+You cannot modify
+You are already a member
+You must provide
+No tags for experiment
+The following images are using this OS Descriptor
+There must be a unique mapping
+Page Error
+cannot freeze someone
+not active
diff --git a/www/sec-check/files_missing.list b/www/sec-check/files_missing.list
index d2db6b0b5709ecaaf17435fb6660473af955207b..cceee4b8513ed5ba843d4d1f9f3e30c69872b516 100644
--- a/www/sec-check/files_missing.list
+++ b/www/sec-check/files_missing.list
@@ -7,6 +7,7 @@
 < cdromqueue.php3
 < cdromrequest.php3
 < chpasswd.php3
+< delaycontrol.php3
 < deletenodelog.php3
 < deleteproject.php3
 < deletesfskey.php3
@@ -15,6 +16,7 @@
 < editsitevars.php3
 < expaccess_form.php3
 < floormap.php3
+< linktest.php3
 < menu.php3
 < modnodeattributes_form.php3
 < newimageid.php3
@@ -25,6 +27,7 @@
 < panicbutton.php3
 < prereserve_node.php3
 < remapexp.php3
+< replayexp.php3
 < request_idleinfo.php3
 < request_swapexp.php3
 < robotmap.php3
diff --git a/www/sec-check/input_names.list b/www/sec-check/input_names.list
index cecf7c74417075f5b46e229ce5edc76e4ce44af2..7b88efd124744902910fb6e6034d53bd9802883f 100644
--- a/www/sec-check/input_names.list
+++ b/www/sec-check/input_names.list
@@ -10,10 +10,8 @@ name="clear_last"
 name="def_boot_cmd_line"
 name="def_boot_osid"
 name="description"
-name="dochange"
 name="eid"
 name="email"
-name="eventrestart"
 name="exp_pideid"
 name="exptidx"
 name="formfields[autoswap]"
@@ -55,7 +53,7 @@ name="formfields[loadpart]"
 name="formfields[localnsfile]"
 name="formfields[max_concurrent]"
 name="formfields[mem_usage]"
-name="formfields[mtype_pc600]"
+name="formfields[mtype_pc850]"
 name="formfields[new_section]"
 name="formfields[node]"
 name="formfields[noidleswap_reason]"
@@ -116,10 +114,8 @@ name="group_id"
 name="group_leader"
 name="group_pid"
 name="imageid"
-name="level"
 name="log_entry"
 name="log_type"
-name="modbase"
 name="mode"
 name="newprefix"
 name="newtype"
@@ -146,7 +142,6 @@ name="pid"
 name="poweron"
 name="query"
 name="range"
-name="reboot"
 name="referrer"
 name="remap[0]"
 name="remap[1]"
diff --git a/www/sec-check/normal_cases.wget b/www/sec-check/normal_cases.wget
index c9ee4d1bf783ff9c1defcd5dbd31bdf4c6cdc2e4..b70604d490192ecbb3d397fe4475aeb94cf159c6 100644
--- a/www/sec-check/normal_cases.wget
+++ b/www/sec-check/normal_cases.wget
@@ -4,16 +4,14 @@ wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_tags.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3?exptidx=1"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O archive_missing.php3.html "https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3?exptidx=1"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O boot.php3.html --post-data "confirmed=Confirm&node_id=pc4" "https://myboss.vulnelab.testbed.emulab.net/boot.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O delaycontrol.php3.html --post-data "dochange=1&eid=testexp1&pid=testproj&modbase=1" "https://myboss.vulnelab.testbed.emulab.net/delaycontrol.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editexp.php3.html --post-data "formfields[mem_usage]=0&formfields[batchmode]=1&formfields[idleswap_timeout]=4&submit=Submit&formfields[autoswap]=1&formfields[autoswap_timeout]=10&formfields[noidleswap_reason]=Testing.&eid=hwdown&formfields[cpu_usage]=3&formfields[idleswap]=0&formfields[linktest_level]=0&formfields[description]=Descriptive%20text.&pid=emulab-ops" "https://myboss.vulnelab.testbed.emulab.net/editexp.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editgroup.php3.html --post-data "testuser$$trust=local_root&add_testuser=permit&gid=testgroup&pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/editgroup.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editimageid.php3.html --post-data "formfields[mtype_pc600]=Yep&formfields[path]=/proj/testbed/images/FBSD-RON.ndz&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive%20text." "https://myboss.vulnelab.testbed.emulab.net/editimageid.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O editimageid.php3.html --post-data "formfields[path]=/proj/testbed/images/FBSD-RON.ndz&formfields[mtype_pc850]=Yep&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive%20text." "https://myboss.vulnelab.testbed.emulab.net/editimageid.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O feedback.php3.html "https://myboss.vulnelab.testbed.emulab.net/feedback.php3?mode=clear&confirmed=Confirm&clear_last=1&eid=testexp1&clear_bootstrap=1&pid=testproj"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O gensslcert.php3.html --post-data "formfields[passphrase1]=EinE_tmp&submit=Create%20SSL%20Cert&formfields[passphrase2]=EinE_tmp&formfields[target_uid]=testuser" "https://myboss.vulnelab.testbed.emulab.net/gensslcert.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O kb-manage.php3.html --post-data "formfields[xref_tag]=test_tag&formfields[title]=Test%20title.&submit=Submit&formfields[section]=none&formfields[body]=Test%20body.&formfields[faq_entry]=0&formfields[new_section]=test_section" "https://myboss.vulnelab.testbed.emulab.net/kb-manage.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O linktest.php3.html --post-data "level=0&eid=testexp1&pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/linktest.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O loadimage.php3.html --post-data "node=pc4&submit=Go%21&imageid=emulab-ops-RHL90-STD" "https://myboss.vulnelab.testbed.emulab.net/loadimage.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O modifyexp.php3.html --post-data "nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp1&eventrestart=1&pid=testbed&reboot=1" "https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O modifyexp.php3.html --post-data "nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp1&pid=testbed" "https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O moduserinfo.php3.html --post-data "formfields[usr_country]=USA&formfields[user_interface]=plab&formfields[usr_city]=Salt%20Lake%20Silly&formfields[usr_affil]=Emulab%20Scripts&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test%20User&submit=Submit&formfields[usr_addr]=Silly&formfields[target_uid]=testuser&formfields[notes]=&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_phone]=801-123-4567&formfields[w_password1]=;lkjasdf&formfields[usr_zip]=12345&formfields[w_password2]=&formfields[usr_shell]=sh&formfields[usr_addr2]=Address&formfields[usr_title]=Tester" "https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newnodelog.php3.html --post-data "log_type=misc&log_entry=Test%20log%20entry.&node_id=pc4" "https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newnodes_list.php3.html "https://myboss.vulnelab.testbed.emulab.net/newnodes_list.php3?remap[4]=&remap[5]=&newprefix=&remap[6]=&newtype=&create=Create%20selected%20nodes&remap[0]=&remap[1]=&remap[2]=&remap[3]=&addnumber="
@@ -22,10 +20,9 @@ wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O nsgen.php3.html "https://myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plabdevbox&templatevalues[ImageName]=PLAB-DEVBOX&templatevalues[NodeName]=devbox&templatevalues[HWType]=pc"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O plab_ez.php3.html "https://myboss.vulnelab.testbed.emulab.net/plab_ez.php3?formfields[count]=10&formfields[when]=52&submit=Create%20it&formfields[type]=pcplab&formfields[canfail]=Yep&formfields[units]=168&formfields[resusage]=3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O powertime.php3.html "https://myboss.vulnelab.testbed.emulab.net/powertime.php3?nodes[]=pc4&poweron=Yep&confirmed=Confirm"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O replayexp.php3.html --post-data "confirmed=Confirm&eid=testexp1&pid=testbed" "https://myboss.vulnelab.testbed.emulab.net/replayexp.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showpubkeys.php3.html --post-data "MAX_FILE_SIZE=1024&formfields[target_uid]=testuser&formfields[usr_key]=" "https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showsfskeys.php3.html --post-data "formfields[target_uid]=testuser&formfields[usr_key]=" "https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showsumstats.php3.html "https://myboss.vulnelab.testbed.emulab.net/showsumstats.php3?sortby=pdays&range=mm/dd/yy-mm/dd/yy&showby=users"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O showuser_list.php3.html --post-data "sortby=uid&searchfor=&showtype=loggedin" "https://myboss.vulnelab.testbed.emulab.net/showuser_list.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O swapexp.php3.html --post-data "confirmed=Confirm&eid=testexp2&inout=in&pid=testbed" "https://myboss.vulnelab.testbed.emulab.net/swapexp.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O swapexp.php3.html --post-data "confirmed=Confirm&eid=testexp1&inout=in&pid=testbed" "https://myboss.vulnelab.testbed.emulab.net/swapexp.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O updateaccounts.php3.html --post-data "confirmed=Confirm&eid=opsnodes&nodeid=pc4&pid=emulab-ops" "https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3"
diff --git a/www/sec-check/setup_cases.wget b/www/sec-check/setup_cases.wget
index 4fe189fc5badc13bf13d531555d83a75ee165465..74f971ec1f06d4a80a8c5bbc29d5611ac2e25e7a 100644
--- a/www/sec-check/setup_cases.wget
+++ b/www/sec-check/setup_cases.wget
@@ -2,7 +2,7 @@ wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O joinproject.php3.html --post-data "formfields[usr_country]=USA&MAX_FILE_SIZE=1024&formfields[usr_city]=Salt%20Lake%20Silly&formfields[usr_affil]=Emulab%20Scripts&formfields[wikiname]=TestUser&formfields[gid]=&formfields[pid]=testproj&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test%20User&submit=Submit&formfields[usr_addr]=Silly&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[joining_uid]=testuser&formfields[usr_addr2]=Address&formfields[usr_title]=Tester" "https://myboss.vulnelab.testbed.emulab.net/joinproject.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O beginexp_html.php3.html --post-data "formfields[exp_autoswap_timeout]=16&formfields[exp_noswap_reason]=&formfields[exp_id]=testexp1&beginexp=Submit&formfields[exp_noidleswap_reason]=Testing.&formfields[exp_idleswap_timeout]=4&MAX_FILE_SIZE=1024&formfields[exp_batched]=Yep&formfields[exp_swappable]=1&formfields[exp_preload]=Yep&formfields[exp_savedisk]=Yep&formfields[exp_description]=Test%20experiment.&formfields[exp_linktest]=0&formfields[exp_gid]=&formfields[exp_pid]=testproj&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&formfields[exp_autoswap]=1&formfields[exp_idleswap]=0" "https://myboss.vulnelab.testbed.emulab.net/beginexp_html.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newgroup.php3.html --post-data "group_id=&group_description=&group_leader=fish&group_pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/newgroup.php3"
-wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newimageid_ez.php3.html --post-data "formfields[mtype_pc600]=Yep&formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc4&formfields[description]=Descriptive%20text.&formfields[imagename]=&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none" "https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3"
+wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newimageid_ez.php3.html --post-data "formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/&formfields[mtype_pc850]=Yep&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc4&formfields[description]=Descriptive%20text.&formfields[imagename]=&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none" "https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newmmlist.php3.html --post-data "formfields[listname]=&formfields[pid]=testproj&submit=Submit&formfields[password1]=EinE_tmp&formfields[password2]=EinE_tmp&formfields[fullname]=" "https://myboss.vulnelab.testbed.emulab.net/newmmlist.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O newosid.php3.html --post-data "os_feature_isup=checked&os_magic=&os_path=&os_version=&os_feature_ping=checked&os_feature_ipod=checked&OS=Linux&os_feature_linktest=checked&op_mode=NORMALv2&description=&os_feature_ssh=checked&osname=&pid=testproj" "https://myboss.vulnelab.testbed.emulab.net/newosid.php3"
 wget -S -k --keep-session-cookies --no-check-certificate --load-cookies cookies.txt -O template_create.php.html --post-data "MAX_FILE_SIZE=1024&formfields[tid]=&formfields[localnsfile]=&formfields[gid]=&formfields[pid]=testproj&create=Create%20Template&formfields[description]=Descriptive%20text." "https://myboss.vulnelab.testbed.emulab.net/template_create.php"
diff --git a/www/sec-check/site_files.list b/www/sec-check/site_files.list
index d0b6b4c79df1262fb35b4d8ac882df09fd94a0a1..679a518e3815e30fb3cb7bcf335316522e1354ba 100644
--- a/www/sec-check/site_files.list
+++ b/www/sec-check/site_files.list
@@ -1,7 +1,6 @@
 archive_view.php3
 beginexp_form.php3
 boot.php3
-delaycontrol.php3
 deletegroup.php3
 deleteimageid.php3
 deleteosid.php3
@@ -18,7 +17,6 @@ gensslcert.php3
 joinproject.php3
 kb-manage.php3
 kb-search.php3
-linktest.php3
 loadimage.php3
 login.php3
 modifyexp.php3
@@ -36,7 +34,6 @@ nsgen.php3
 password.php3
 plab_ez.php3
 powertime.php3
-replayexp.php3
 showpubkeys.php3
 showsfskeys.php3
 showsumstats.php3
diff --git a/www/sec-check/site_forms.list b/www/sec-check/site_forms.list
index b9c90f516230b068d19be21f251393b279c99920..48bb05b6923f5f94d7db4082d2dad76b6e51eb64 100644
--- a/www/sec-check/site_forms.list
+++ b/www/sec-check/site_forms.list
@@ -15,7 +15,8 @@
 ./myboss.vulnelab.testbed.emulab.net/archive_view.php3?exptidx=8:79:<font size=+1>This is the (Subversion) archive for experiment 8.<br><br></font><form action='https://myboss.vulnelab.testbed.emulab.net/archive_tag.php3' style="float:left; width:33%;" method=get>
 ./myboss.vulnelab.testbed.emulab.net/archive_view.php3?exptidx=8:80:<b><input type=submit name=tag value='Tag Archive'></b><input type=hidden name=exptidx value='8'></form><form action='https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3' style="float:left; width:33%;" method=get><b><input type=submit name=tag value='Show Tags'></b><input type=hidden name=exptidx value='8'></form><form action='https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3' style="float:left; width:33%;" method=get><b><input type=submit name=missing value='Show Missing Files'></b><input type=hidden name=exptidx value='8'></form><iframe width=100% height=800 scrolling=yes src='cvsweb/cvsweb.php3?exptidx=8' border=2></iframe>
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3:116:            </ul></p><br><form name=form1 enctype=multipart/form-data
-./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061003-120217-208_preswapmod:98:<form name=form1 enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=7:T20061121-120618-396_preswapmod:98:<form name=form1 enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061122-041524-229_swapout:98:<form name=form1 enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=emulab-ops,hwdown:98:<form name=form1 enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=emulab-ops,nfree-leases:98:<form name=form1 enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=emulab-ops,oldreserved:98:<form name=form1 enctype=multipart/form-data
@@ -30,11 +31,9 @@
 ./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=cisco5:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=cisco5>
 ./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=cisco8:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=cisco8>
 ./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=ops:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=ops>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc25:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc25>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc37:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc37>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc4:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc4>
-./myboss.vulnelab.testbed.emulab.net/boot.php3?pid=testbed&eid=testexp1:95:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=pid value=testbed>
-./myboss.vulnelab.testbed.emulab.net/delaycontrol.php3?pid=testbed&eid=testexp1:90:<form action='https://myboss.vulnelab.testbed.emulab.net/delaycontrol.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc109:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc109>
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc150:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc150>
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc157:94:<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method=post><input type=hidden name=node_id value=pc157>
 ./myboss.vulnelab.testbed.emulab.net/deletegroup.php3?pid=testproj&gid=testgroup:82:<form action='deletegroup.php3?pid=testproj&amp;gid=testgroup' method=post><b><input type=submit name=confirmed value=Confirm></b>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=emulab-ops-FBSD-RON:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='emulab-ops-FBSD-RON'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-EEIDE-FC2-0915:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-EEIDE-FC2-0915'>
@@ -68,6 +67,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD49-CLEAN:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD49-CLEAN'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD49-STABLE-BOSS'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD49-UPDATE:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD49-UPDATE'>
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-MROUTING:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD54-MROUTING'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-NEWPORTS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD54-NEWPORTS'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-PORTSRC:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD54-PORTSRC'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD60-NEWPORTS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-FBSD60-NEWPORTS'>
@@ -90,6 +90,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-EMSTAR:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-EMSTAR'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LBS:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LBS'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LBSTOO:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LBSTOO'>
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LINKDELAY:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LINKDELAY'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LT:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-LT'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-NEWWIFI:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-NEWWIFI'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-STOLEN:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-RHL90-STOLEN'>
@@ -117,6 +118,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-SP1-pc3000-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-SP2-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-SP2-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-SP2-pc3000-new'>
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-TMP:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-TMP'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-UPD-pc3000-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPDATE-new:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-UPDATE-new'>
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep:82:<form action='https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3' method=post><input type=hidden name=imageid value='testbed-WINXP-UPDATE-sysprep'>
@@ -153,6 +155,7 @@
 ./myboss.vulnelab.testbed.emulab.net/deletepubkey.php3?target_uid=testuser&key=1:82:<form action='deletepubkey.php3?target_uid=testuser&amp;key=1'
 ./myboss.vulnelab.testbed.emulab.net/deletepubkey.php3?target_uid=testuser&key=2:82:<form action='deletepubkey.php3?target_uid=testuser&amp;key=2'
 ./myboss.vulnelab.testbed.emulab.net/deleteuser.php3?target_uid=testuser&target_pid=testproj:81:<form action="https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3" method=post><input type=hidden name=target_uid value="testuser">
+./myboss.vulnelab.testbed.emulab.net/deleteuser.php3?target_uid=testusr2&target_pid=testproj:81:<form action="https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3" method=post><input type=hidden name=target_uid value="testusr2">
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=hwdown:82:          <form action="editexp.php3?pid=emulab-ops&amp;eid=hwdown" method=post>
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=nfree-leases:82:          <form action="editexp.php3?pid=emulab-ops&amp;eid=nfree-leases" method=post>
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=oldreserved:82:          <form action="editexp.php3?pid=emulab-ops&amp;eid=oldreserved" method=post>
@@ -195,6 +198,7 @@
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-CLEAN:80:          <form action='editimageid.php3?imageid=testbed-FBSD49-CLEAN'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS:80:          <form action='editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-UPDATE:80:          <form action='editimageid.php3?imageid=testbed-FBSD49-UPDATE'
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-MROUTING:80:          <form action='editimageid.php3?imageid=testbed-FBSD54-MROUTING'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-NEWPORTS:80:          <form action='editimageid.php3?imageid=testbed-FBSD54-NEWPORTS'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-PORTSRC:80:          <form action='editimageid.php3?imageid=testbed-FBSD54-PORTSRC'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD60-NEWPORTS:80:          <form action='editimageid.php3?imageid=testbed-FBSD60-NEWPORTS'
@@ -217,6 +221,7 @@
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-EMSTAR:80:          <form action='editimageid.php3?imageid=testbed-RHL90-EMSTAR'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBS:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LBS'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBSTOO:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LBSTOO'
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LINKDELAY:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LINKDELAY'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LT:80:          <form action='editimageid.php3?imageid=testbed-RHL90-LT'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-NEWWIFI:80:          <form action='editimageid.php3?imageid=testbed-RHL90-NEWWIFI'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-STOLEN:80:          <form action='editimageid.php3?imageid=testbed-RHL90-STOLEN'
@@ -244,6 +249,7 @@
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-SP2-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new'
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-TMP:80:          <form action='editimageid.php3?imageid=testbed-WINXP-TMP'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-new:80:          <form action='editimageid.php3?imageid=testbed-WINXP-UPDATE-new'
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep:80:          <form action='editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep'
@@ -263,9 +269,9 @@
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=opsnodes:97:<form action='endexp.php3?pid=emulab-ops&amp;eid=opsnodes' method=post><input type=hidden name=exp_pideid value="">
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=reloading:92:<form action='endexp.php3?pid=emulab-ops&amp;eid=reloading' method=post><input type=hidden name=exp_pideid value="">
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=reloadpending:92:<form action='endexp.php3?pid=emulab-ops&amp;eid=reloadpending' method=post><input type=hidden name=exp_pideid value="">
-./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=testbed&eid=testexp1:97:<form action='endexp.php3?pid=testbed&amp;eid=testexp1' method=post><input type=hidden name=exp_pideid value="">
+./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=testbed&eid=testexp1:92:<form action='endexp.php3?pid=testbed&amp;eid=testexp1' method=post><input type=hidden name=exp_pideid value="">
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=testbed&eid=testexp2:100:<form action='endexp.php3?pid=testbed&amp;eid=testexp2' method=post><input type=hidden name=exp_pideid value="">
-./myboss.vulnelab.testbed.emulab.net/feedback.php3?pid=testbed&eid=testexp1&mode=clear:94:<form action="https://myboss.vulnelab.testbed.emulab.net/feedback.php3" method=get><input type=hidden name=pid value=testbed>
+./myboss.vulnelab.testbed.emulab.net/feedback.php3?pid=testbed&eid=testexp1&mode=clear:89:<form action="https://myboss.vulnelab.testbed.emulab.net/feedback.php3" method=get><input type=hidden name=pid value=testbed>
 ./myboss.vulnelab.testbed.emulab.net/feedback.php3?pid=testbed&eid=testexp2&mode=clear:97:<form action="https://myboss.vulnelab.testbed.emulab.net/feedback.php3" method=get><input type=hidden name=pid value=testbed>
 ./myboss.vulnelab.testbed.emulab.net/freenode.php3?node_id=ops:224:<form action='freenode.php3?node_id=ops' method=post><b><input type=submit name=confirmed value=Confirm></b>
 ./myboss.vulnelab.testbed.emulab.net/freezeuser.php3?target_uid=fish&action=freeze:89:<form action="https://myboss.vulnelab.testbed.emulab.net/freezeuser.php3" method=post><input type=hidden name=target_uid value="fish">
@@ -275,7 +281,6 @@
 ./myboss.vulnelab.testbed.emulab.net/kb-manage.php3:96:          <form action='kb-manage.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/kb-search.php3:61:          <form action="kb-search.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/kb-search.php3:77:          <form action="kb-search.php3" method=get>
-./myboss.vulnelab.testbed.emulab.net/linktest.php3?pid=testbed&eid=testexp1:320:<form action="https://myboss.vulnelab.testbed.emulab.net/linktest.php3" method=post name=myform id=myform><input type=hidden name=pid value=testbed>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=emulab-ops-FBSD-RON:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-EEIDE-FC2-0915:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-EEIDE-RHL90-0827:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -308,6 +313,7 @@
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD49-CLEAN:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD49-STABLE-BOSS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD49-UPDATE:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-MROUTING:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-NEWPORTS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-PORTSRC:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD60-NEWPORTS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -330,6 +336,7 @@
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-EMSTAR:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LBS:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LBSTOO:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LINKDELAY:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LT:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-NEWWIFI:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-STOLEN:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -357,6 +364,7 @@
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-SP1-pc3000-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-SP2-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-SP2-pc3000-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-TMP:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPD-pc3000-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPDATE-new:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPDATE-sysprep:78:<center><br /><form action='https://myboss.vulnelab.testbed.emulab.net/loadimage.php3' method='post'>
@@ -376,6 +384,7 @@
 ./myboss.vulnelab.testbed.emulab.net/modifyexp.php3?pid=testbed&eid=testexp2:101:<tr><th colspan=2><font size='+1'><a href='clientui.php3?pid=testbed&amp;eid=testexp2'>GUI Editor</a> - Edit the topology using a Java applet.</font></th></tr><form name='form1' action='https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3?pid=testbed&amp;eid=testexp2&amp;go=1' method='post' onsubmit="return false;" enctype=multipart/form-data><tr><th>Upload new NS file: </th><td><input type=hidden name=MAX_FILE_SIZE value=512000><input type=file name=exp_nsfile size=30 onchange="this.form.syntax.disabled=(this.value=='')" /></td></tr>
 ./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=fish:95:          <form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method=post>
 ./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=testuser:86:          <form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method=post>
+./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=testusr2:86:          <form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method=post>
 ./myboss.vulnelab.testbed.emulab.net/newgroup_form.php3?pid=testproj:78:<form action="https://myboss.vulnelab.testbed.emulab.net/newgroup.php3" method=post>
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=cisco1:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
@@ -384,9 +393,9 @@
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=cisco5:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=cisco8:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=ops:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc25:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc37:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc4:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc109:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc150:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc157:136:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?nodetype=mote:137:          <form action='newimageid_ez.php3' enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/newmmlist.php3:119:          <form action='newmmlist.php3' method=post name=myform>
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=cisco1:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
@@ -395,9 +404,9 @@
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=cisco5:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=cisco8:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=ops:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc25:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc37:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc4:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc109:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc150:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc157:84:     <form action='https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3' method=post>
 ./myboss.vulnelab.testbed.emulab.net/newnodes_list.php3:90:<form action="newnodes_list.php3" method="get" name="nodeform">
 ./myboss.vulnelab.testbed.emulab.net/newosid_form.php3:90:<form action="https://myboss.vulnelab.testbed.emulab.net/newosid.php3" method="post" name=idform>
 ./myboss.vulnelab.testbed.emulab.net/newproject.php3:108:          <form enctype=multipart/form-data name=myform
@@ -408,9 +417,9 @@
 ./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=cisco5:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
 ./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=cisco8:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
 ./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=ops:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc25:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc37:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc4:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc109:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc150:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc157:80:<form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer="
 ./myboss.vulnelab.testbed.emulab.net/nscheck_form.php3:88:<form enctype="multipart/form-data"
 ./myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plabdevbox:98:<form name='form1' action='https://myboss.vulnelab.testbed.emulab.net/nsgen.php3' method='get'>
 ./myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plinabox:97:<form name='form1' action='https://myboss.vulnelab.testbed.emulab.net/nsgen.php3' method='get'>
@@ -422,14 +431,15 @@
 ./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=cisco5:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
 ./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=cisco8:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
 ./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=ops:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc25:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc37:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc4:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
-./myboss.vulnelab.testbed.emulab.net/replayexp.php3?&pid=testbed&eid=testexp1:94:<form action='https://myboss.vulnelab.testbed.emulab.net/replayexp.php3?pid=testbed&amp;eid=testexp1'
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc109:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc150:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc157:78:<center>Update last power time for:<br><form action='https://myboss.vulnelab.testbed.emulab.net/powertime.php3' method=get><br><table><tr><th>Update?</th><th>Node ID</th><th>Last Power</th></tr><tr>
 ./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=fish:212:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=testuser:128:          <form enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=testusr2:95:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=fish:100:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=testuser:91:          <form enctype=multipart/form-data
+./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=testusr2:91:          <form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=projects&sortby=edays&range=day:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=projects&sortby=edays&range=month:91:            Week</a>, Month, </b><form action="showsumstats.php3" method=get>
@@ -489,12 +499,7 @@
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=users&sortby=uid:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3?showby=users:91:            Month</a>, </b><form action="showsumstats.php3" method=get>
 ./myboss.vulnelab.testbed.emulab.net/showuser_list.php3:94:<form action="showuser_list.php3" method=post>
+./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp1:89:<form action='swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp1'
 ./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp2:97:<form action='swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp2'
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=out&pid=testbed&eid=testexp1:94:<form action='swapexp.php3?inout=out&amp;pid=testbed&amp;eid=testexp1'
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=restart&pid=testbed&eid=testexp1:94:<form action='swapexp.php3?inout=restart&amp;pid=testbed&amp;eid=testexp1'
 ./myboss.vulnelab.testbed.emulab.net/template_create.php:87:<form enctype=multipart/form-data
 ./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=emulab-ops&eid=opsnodes&nodeid=ops:100:<form action='https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=emulab-ops&amp;eid=opsnodes' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc25:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc37:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc4:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1:100:<form action='updateaccounts.php3?pid=testbed&amp;eid=testexp1' method=post><b><input type=submit name=confirmed value=Confirm></b>
diff --git a/www/sec-check/site_inputs.list b/www/sec-check/site_inputs.list
index 5a2769b96fe9cbe5d336265c28be374d4f446891..5e9f276d88479334a70a1aa33a1c187ee151db3e 100644
--- a/www/sec-check/site_inputs.list
+++ b/www/sec-check/site_inputs.list
@@ -321,7 +321,7 @@
 <input type="checkbox" name="formfields[exp_preload]" value='Yep' >
 <input type="button" name="beginexp" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061003-120217-208_preswapmod
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=7:T20061121-120618-396_preswapmod
 <form name=form1 enctype=multipart/form-data action="beginexp_html.php3" method="post">
 <input type="hidden" name="beginexp" value="Submit" >
 <input type="select" name="formfields[exp_pid]" value=''>
@@ -329,7 +329,29 @@
 <input type="text" name="formfields[exp_id]" value="testexp2-Copy0" size=19 maxlength=19>
 <input type="text" name="formfields[exp_description]" value="testexp2 experiment." size=60>
 <input type="checkbox" name="formfields[exp_branch]" value='1' >
-<input type="hidden" name="formfields[copyid]" value='8:T20061003-120217-208_preswapmod' >
+<input type="hidden" name="formfields[copyid]" value='7:T20061121-120618-396_preswapmod' >
+<input type="hidden" name="formfields[exp_swappable]" value='1' >
+<input type="hidden" name="formfields[exp_noswap_reason]" value=''>
+<input type="checkbox" name="formfields[exp_idleswap]" value='1' checked='1'>
+<input type="text" name="formfields[exp_idleswap_timeout]" value='4' size='3'>
+<input type="textarea" name="formfields[exp_noidleswap_reason]" rows=2 cols=50 >
+<input type="checkbox" name="formfields[exp_autoswap]" value='1' checked='1'>
+<input type="text" name="formfields[exp_autoswap_timeout]" value='16' size='3'>
+<input type="checkbox" name="formfields[exp_savedisk]" value='Yep' >
+<input type="select" name="formfields[exp_linktest]" value="0" >
+<input type="checkbox" name="formfields[exp_batched]" value='Yep' >
+<input type="checkbox" name="formfields[exp_preload]" value='Yep' >
+<input type="button" name="beginexp" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?copyid=8:T20061122-041524-229_swapout
+<form name=form1 enctype=multipart/form-data action="beginexp_html.php3" method="post">
+<input type="hidden" name="beginexp" value="Submit" >
+<input type="select" name="formfields[exp_pid]" value=''>
+<input type="select" name="formfields[exp_gid]" value=''>
+<input type="text" name="formfields[exp_id]" value="testexp1-Copy0" size=19 maxlength=19>
+<input type="text" name="formfields[exp_description]" value="testexp1 experiment." size=60>
+<input type="checkbox" name="formfields[exp_branch]" value='1' >
+<input type="hidden" name="formfields[copyid]" value='8:T20061122-041524-229_swapout' >
 <input type="hidden" name="formfields[exp_swappable]" value='1' >
 <input type="hidden" name="formfields[exp_noswap_reason]" value=''>
 <input type="checkbox" name="formfields[exp_idleswap]" value='1' checked='1'>
@@ -555,39 +577,24 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="node_id" value="pc25" >
+<input type="hidden" name="node_id" value="pc109" >
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="node_id" value="pc37" >
+<input type="hidden" name="node_id" value="pc150" >
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/boot.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="node_id" value="pc4" >
+<input type="hidden" name="node_id" value="pc157" >
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/boot.php3?pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/boot.php3" target=_blank method="post">
-<input type="hidden" name="pid" value="testbed" >
-<input type="hidden" name="eid" value="testexp1" >
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
-./myboss.vulnelab.testbed.emulab.net/delaycontrol.php3?pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/delaycontrol.php3" method="post">
-<input type="hidden" name="dochange" value="1" />
-<input type="hidden" name="eid" value='testexp1' />
-<input type="hidden" name="pid" value='testbed' />
-<input type="checkbox" name="modbase" value="1" >
-<input type="submit" value='Execute' >
-
 ./myboss.vulnelab.testbed.emulab.net/deletegroup.php3?pid=testproj&gid=testgroup
 <form action="deletegroup.php3?pid=testproj&amp;gid=testgroup" method="post">
 <input type="submit" name="confirmed" value="Confirm" >
@@ -785,6 +792,12 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-MROUTING
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
+<input type="hidden" name="imageid" value='testbed-FBSD54-MROUTING' >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-FBSD54-NEWPORTS
 <form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
 <input type="hidden" name="imageid" value='testbed-FBSD54-NEWPORTS' >
@@ -917,6 +930,12 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LINKDELAY
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
+<input type="hidden" name="imageid" value='testbed-RHL90-LINKDELAY' >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-RHL90-LT
 <form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
 <input type="hidden" name="imageid" value='testbed-RHL90-LT' >
@@ -1079,6 +1098,12 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-TMP
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
+<input type="hidden" name="imageid" value='testbed-WINXP-TMP' >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/deleteimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new
 <form action="https://myboss.vulnelab.testbed.emulab.net/deleteimageid.php3" method="post">
 <input type="hidden" name="imageid" value='testbed-WINXP-UPD-pc3000-new' >
@@ -1286,6 +1311,13 @@
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
+./myboss.vulnelab.testbed.emulab.net/deleteuser.php3?target_uid=testusr2&target_pid=testproj
+<form action="https://myboss.vulnelab.testbed.emulab.net/deleteuser.php3" method="post">
+<input type="hidden" name="target_uid" value="testusr2" >
+<input type="hidden" name="target_pid" value="testproj" >
+<input type="submit" name="confirmed" value="Confirm" >
+<input type="submit" name="canceled" value="Cancel" >
+
 ./myboss.vulnelab.testbed.emulab.net/editexp.php3?pid=emulab-ops&eid=hwdown
 <form action="editexp.php3?pid=emulab-ops&amp;eid=hwdown" method="post">
 <input type="text" name="formfields[description]" value='Node reported as down - DO NOT DELETE' size=30>
@@ -1414,658 +1446,679 @@
 <form action="editimageid.php3?imageid=emulab-ops-FBSD-RON" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RON FreeBSD Image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-RON.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-FC2-0915
 <form action="editimageid.php3?imageid=testbed-EEIDE-FC2-0915" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Fedora Core 2 test, Sep 15" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-FC2-0915.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-RHL90-0827
 <form action="editimageid.php3?imageid=testbed-EEIDE-RHL90-0827" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Red Hat Linux 9 test image, Aug 27" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-RHL90-0827.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-RHL90-BASE
 <form action="editimageid.php3?imageid=testbed-EEIDE-RHL90-BASE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Base RHL90 image, created from Red Hat 9.0 CDs" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-RHL90-BASE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-EEIDE-SF
 <form action="editimageid.php3?imageid=testbed-EEIDE-SF" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 with SmartFrog 3.08" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/EEIDE-SF.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-45-ISS0
 <form action="editimageid.php3?imageid=testbed-FBSD-45-ISS0" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.5 with an Initial Sequence Number of 0" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-45-ISS0.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-BOSSCLONE
 <form action="editimageid.php3?imageid=testbed-FBSD-BOSSCLONE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A boss impostor" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-BOSSCLONE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-LT
 <form action="editimageid.php3?imageid=testbed-FBSD-LT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="freebsd with new linktest" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-LT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-PARTIALBOSS
 <form action="editimageid.php3?imageid=testbed-FBSD-PARTIALBOSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Partially-completed boss install" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-PARTIALBOSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-PARTIALOPS
 <form action="editimageid.php3?imageid=testbed-FBSD-PARTIALOPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Partially-completed ops install" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-PARTIALOPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-RON+FBSD47-WITHSRC
 <form action="editimageid.php3?imageid=testbed-FBSD-RON+FBSD47-WITHSRC" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RON Image on slice 1, FBSD47 on slice 2 and bootable, CDROM boot on slice 3" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD-RON+FBSD47+CDBOOT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST2
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Another test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST3
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST3" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Another test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST3.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST4
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST4" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Another FreeBSD test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST4.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD-TEST
 <form action="editimageid.php3?imageid=testbed-FBSD-TEST" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Just a test" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD-TEST.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD10+RHL90-ElabInElab
 <form action="editimageid.php3?imageid=testbed-FBSD10+RHL90-ElabInElab" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Moderately hacked images for ElabInElab" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD10+RHL90-ElabInElab.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-CLEAN
 <form action="editimageid.php3?imageid=testbed-FBSD410-CLEAN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A clean FreeBSD 4.10 disk image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD410-CLEAN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-FORBOSS
 <form action="editimageid.php3?imageid=testbed-FBSD410-FORBOSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.10 with boss ports installed" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD410-FORBOSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-FOROPS
 <form action="editimageid.php3?imageid=testbed-FBSD410-FOROPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.10 with ops ports installed" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD410-FOROPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-LBS
 <form action="editimageid.php3?imageid=testbed-FBSD410-LBS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Nothing special" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD410-LBS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD410-TMP
 <form action="editimageid.php3?imageid=testbed-FBSD410-TMP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="temp" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD410-TMP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD411-BAREBONES
 <form action="editimageid.php3?imageid=testbed-FBSD411-BAREBONES" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FBSD411-CLEAN with client install" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD411-BAREBONES.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD411-CLEAN
 <form action="editimageid.php3?imageid=testbed-FBSD411-CLEAN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A clean FreeBSD 4.11 disk image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD411-CLEAN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD411-SERVER
 <form action="editimageid.php3?imageid=testbed-FBSD411-SERVER" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.11 for boss/ops node" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD411-SERVER.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD45-BOSSNODE
 <form action="editimageid.php3?imageid=testbed-FBSD45-BOSSNODE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Base image (without any localized information) of a boss node" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD45-BOSSNODE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47+RHL73-UPDATE
 <form action="editimageid.php3?imageid=testbed-FBSD47+RHL73-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.7 and Redhat 7.3 update image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD47+RHL73-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47-CLEANOPS
 <form action="editimageid.php3?imageid=testbed-FBSD47-CLEANOPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Clean (no local customization) ops node image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD47-CLEANOPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47-UPDATE
 <form action="editimageid.php3?imageid=testbed-FBSD47-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.7 update image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD47-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD47-onslice2of-RON
 <form action="editimageid.php3?imageid=testbed-FBSD47-onslice2of-RON" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FBSD47 withsrc for slice2 of RON Image only" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD47-onslice2of-RON.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-CLEAN
 <form action="editimageid.php3?imageid=testbed-FBSD49-CLEAN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A clean installation of FreeBSD 4.9" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD49-CLEAN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS
 <form action="editimageid.php3?imageid=testbed-FBSD49-STABLE-BOSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="A proto-boss image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD49-STABLE-BOSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD49-UPDATE
 <form action="editimageid.php3?imageid=testbed-FBSD49-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 4.9 update image" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/FBSD49-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-MROUTING
+<form action="editimageid.php3?imageid=testbed-FBSD54-MROUTING" method="post" name=idform>
+<input type="text" name="formfields[description]" value="FreeBSD 5.4 + MROUTING option enabled" size=50>
+<input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD54-MROUTING.ndz" size=50>
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-NEWPORTS
 <form action="editimageid.php3?imageid=testbed-FBSD54-NEWPORTS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 5.4 with new base ports, working on Emulab ports" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD54-NEWPORTS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD54-PORTSRC
 <form action="editimageid.php3?imageid=testbed-FBSD54-PORTSRC" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 5.4 with ports ungraded to current and source" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD54-PORTSRC.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD60-NEWPORTS
 <form action="editimageid.php3?imageid=testbed-FBSD60-NEWPORTS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 6.0 with new ports installed" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD60-NEWPORTS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD61-STD
 <form action="editimageid.php3?imageid=testbed-FBSD61-STD" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Standard FBSD6.1 image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD61-STD.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FBSD7-TEST
 <form action="editimageid.php3?imageid=testbed-FBSD7-TEST" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FreeBSD 7 (CURRENT) test image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FBSD7-TEST.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FC4-ANDRE
 <form action="editimageid.php3?imageid=testbed-FC4-ANDRE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 image with updated kernel from ReplicaTools project - testing" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FC4-UPDATE-2.6.17.7.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FC4-EVAL
 <form action="editimageid.php3?imageid=testbed-FC4-EVAL" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 updated to work on the eval Dell boxes" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FC4-EVAL.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-FC4-LBS
 <form action="editimageid.php3?imageid=testbed-FC4-LBS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="FC4 image, nothing special about it" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/FC4-LBS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-LBS-DELAY
 <form action="editimageid.php3?imageid=testbed-LBS-DELAY" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing minor changes to dummynet" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/LBS-DELAY.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-MIKEFOO
 <form action="editimageid.php3?imageid=testbed-MIKEFOO" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Mike Foo Image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/MIKEFOO.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-MIKES-WORLD
 <form action="editimageid.php3?imageid=testbed-MIKES-WORLD" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Mike FreeBSD 4.7 build environment" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/MIKES-WORLD.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-MyCutsomImage
 <form action="editimageid.php3?imageid=testbed-MyCutsomImage" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Roopesh's custom image." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/roop_gateway.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-OBSD-TMP
 <form action="editimageid.php3?imageid=testbed-OBSD-TMP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="OpenBSD prototype" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/OBSD-TMP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL-NETPERF
 <form action="editimageid.php3?imageid=testbed-RHL-NETPERF" method="post" name=idform>
 <input type="text" name="formfields[description]" value="standard rhl with netperf installed and netserver running on startup" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL-NETPERF.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEMP
 <form action="editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEMP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Temp image until leigh gets a chance to look at it" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-IXPHOST-TEMP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEST
 <form action="editimageid.php3?imageid=testbed-RHL73-IXPHOST-TEST" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing some changes to the ixphost image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-IXPHOST-TEST.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-UPDATE2
 <form action="editimageid.php3?imageid=testbed-RHL73-UPDATE2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 7.3 update image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-UPDATE2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-UPDATE
 <form action="editimageid.php3?imageid=testbed-RHL73-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 7.3 update image - Not for public use" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/RHL73-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL73-VSERV
 <form action="editimageid.php3?imageid=testbed-RHL73-VSERV" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testbed RHL73 image with vserver patched kernel and vtun" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL73-VSERV.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-EMSTAR
 <form action="editimageid.php3?imageid=testbed-RHL90-EMSTAR" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RHL90-WIRELESS with emstar installed and configured" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-EMSTAR.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBS
 <form action="editimageid.php3?imageid=testbed-RHL90-LBS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RedHat 9.0 with wireless support" size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/RHL90-LBS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LBSTOO
 <form action="editimageid.php3?imageid=testbed-RHL90-LBSTOO" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 9.0 image, nothing special about it." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-LBSTOO." size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LINKDELAY
+<form action="editimageid.php3?imageid=testbed-RHL90-LINKDELAY" method="post" name=idform>
+<input type="text" name="formfields[description]" value="Link delay test and build image" size=50>
+<input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-LINKDELAY.ndz" size=50>
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-LT
 <form action="editimageid.php3?imageid=testbed-RHL90-LT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="redhat with new linktest stuff" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-LT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-NEWWIFI
 <form action="editimageid.php3?imageid=testbed-RHL90-NEWWIFI" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Image with new madwifi-ng driver" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-NEWWIFI.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-STOLEN
 <form action="editimageid.php3?imageid=testbed-RHL90-STOLEN" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Sai's 9.0 image borrowed for compiling stuff" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-STOLEN.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-UPDATE
 <form action="editimageid.php3?imageid=testbed-RHL90-UPDATE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Redhat 9.0 Update image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-USRP
 <form action="editimageid.php3?imageid=testbed-RHL90-USRP" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RedHat 9.0 with USRP software" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-USRP.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS-2
 <form action="editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS-2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="With gcc-3.3.2 toolchain" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-XSCALE-CROSS-2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS
 <form action="editimageid.php3?imageid=testbed-RHL90-XSCALE-CROSS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="RHL9 image with xscale (ARM) cross compiler toolchain" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/RHL90-XSCALE-CROSS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-TOSSurge
 <form action="editimageid.php3?imageid=testbed-TOSSurge" method="post" name=idform>
 <input type="text" name="formfields[description]" value="TinyOS Surge kernel" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/TOSSurge.exe" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-UMASS-BOSSOPS2
 <form action="editimageid.php3?imageid=testbed-UMASS-BOSSOPS2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Half-done attempt to make a combined boss/ops image for UMass" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/UMASS-BOSSOPS2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-UMASS-BOSSOPS
 <form action="editimageid.php3?imageid=testbed-UMASS-BOSSOPS" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Half-done attempt to make a combined boss/ops node for umass" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/UMASS-BOSSOPS.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-02-16
 <form action="editimageid.php3?imageid=testbed-WINXP-02-16" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-10-24
 <form action="editimageid.php3?imageid=testbed-WINXP-10-24" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-12-08
 <form action="editimageid.php3?imageid=testbed-WINXP-12-08" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-UPDATE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP1-cygwn
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP1-cygwn" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, with SP1a and Cygwin added, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP1-cygwn.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP1
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP1" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, with SP1a added, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP1.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP2-3000
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP2-3000" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install for the PC3000, with SP2 and Windows Update." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP2-3000.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-SP2-cygwn
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-SP2-cygwn" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, with Cygwin and SP2 added, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-SP2-cygwn.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE-pc3000
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE-pc3000" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare MSDN Windows XP 2001, pc3000 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE-pc3000.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-BASE
 <form action="editimageid.php3?imageid=testbed-WINXP-BASE" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Bare WinXP install, pc850 only." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-BASE.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-CURRENT
 <form action="editimageid.php3?imageid=testbed-WINXP-CURRENT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Now an alias for WINXP-UPDATE-pc3000." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE-pc3000.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-PPT
 <form action="editimageid.php3?imageid=testbed-WINXP-PPT" method="post" name=idform>
 <input type="text" name="formfields[description]" value="WIndows XP update image with Powerpoint installed" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-PPT.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP0-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP0-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP0-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP0-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP0-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP0-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP0-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP0-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP1-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP1-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value=" Testing new SP1-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP1-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP1-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP1-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP1-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP2-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP2-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP2-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-SP2-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new SP2-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-SP2-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-TMP
+<form action="editimageid.php3?imageid=testbed-WINXP-TMP" method="post" name=idform>
+<input type="text" name="formfields[description]" value="Temporary WINXP image for testing." size=50>
+<input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-TMP.ndz" size=50>
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new
 <form action="editimageid.php3?imageid=testbed-WINXP-UPD-pc3000-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new UPDATE-pc3000 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE-pc3000-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-new
 <form action="editimageid.php3?imageid=testbed-WINXP-UPDATE-new" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing new UPDATE-pc850 image." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/WINXP-UPDATE-new.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep
 <form action="editimageid.php3?imageid=testbed-WINXP-UPDATE-sysprep" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Try making a hardware independent image with SysPrep." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/WINXP-UPDATE-sysprep.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-XPizzo4
 <form action="editimageid.php3?imageid=testbed-XPizzo4" method="post" name=idform>
 <input type="text" name="formfields[description]" value="copy of ITIS6167/XPizzo4" size=50>
 <input type="text" name="formfields[path]" value="/groups/testbed/windows/images/XPizzo4.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-XPizzo
 <form action="editimageid.php3?imageid=testbed-XPizzo" method="post" name=idform>
 <input type="text" name="formfields[description]" value="copy of ITIS6167/XPizzo" size=50>
 <input type="text" name="formfields[path]" value="/groups/testbed/windows/images/XPizzo.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-fc3-proto
 <form action="editimageid.php3?imageid=testbed-fc3-proto" method="post" name=idform>
 <input type="text" name="formfields[description]" value="fc3" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/fc3-proto.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-linux-2.4.9-click
 <form action="editimageid.php3?imageid=testbed-linux-2.4.9-click" method="post" name=idform>
 <input type="text" name="formfields[description]" value="linux version 2.4.9 with click modifications" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/linux-2.4.9-click.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-motdisk
 <form action="editimageid.php3?imageid=testbed-motdisk" method="post" name=idform>
 <input type="text" name="formfields[description]" value="speaical motd" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/motdisk.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-robtest
 <form action="editimageid.php3?imageid=testbed-robtest" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Rob's test image" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/robtest.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_winxp_base
 <form action="editimageid.php3?imageid=testbed-russ_winxp_base" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Base WinXP image that Russ maintains" size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/russ_winxp_base.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_xp_test2
 <form action="editimageid.php3?imageid=testbed-russ_xp_test2" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing." size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/russ_xp_test2.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_xp_test3
 <form action="editimageid.php3?imageid=testbed-russ_xp_test3" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Testing. " size=50>
 <input type="text" name="formfields[path]" value="/proj/testbed/images/russ_xp_test3.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/editimageid.php3?imageid=testbed-russ_xp_test
 <form action="editimageid.php3?imageid=testbed-russ_xp_test" method="post" name=idform>
 <input type="text" name="formfields[description]" value="Test XP image loading." size=50>
 <input type="text" name="formfields[path]" value="/usr/testbed/images/russ_xp_test.ndz" size=50>
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
 ./myboss.vulnelab.testbed.emulab.net/endexp.php3?pid=emulab-ops&eid=hwdown
@@ -2182,13 +2235,6 @@
 <input type="radio" name="query_which" value="both" checked >
 <input type="submit" name="submit" value='Submit Query' >
 
-./myboss.vulnelab.testbed.emulab.net/linktest.php3?pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/linktest.php3" method="post" name=myform id=myform>
-<input type="hidden" name="pid" value="testbed" >
-<input type="hidden" name="eid" value="testexp1" >
-<input type="select" name="level" value="0" >
-<input type="button" name="action" value="Start" id=action >
-
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=emulab-ops-FBSD-RON
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2381,6 +2427,12 @@
 <input type="hidden" name="imageid" value='testbed-FBSD49-UPDATE' >
 <input type="submit" name="submit" value='Go!' >
 
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-MROUTING
+<form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
+<input type="text" name="node" value=''>
+<input type="hidden" name="imageid" value='testbed-FBSD54-MROUTING' >
+<input type="submit" name="submit" value='Go!' >
+
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-FBSD54-NEWPORTS
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2513,6 +2565,12 @@
 <input type="hidden" name="imageid" value='testbed-RHL90-LBSTOO' >
 <input type="submit" name="submit" value='Go!' >
 
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LINKDELAY
+<form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
+<input type="text" name="node" value=''>
+<input type="hidden" name="imageid" value='testbed-RHL90-LINKDELAY' >
+<input type="submit" name="submit" value='Go!' >
+
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-RHL90-LT
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2675,6 +2733,12 @@
 <input type="hidden" name="imageid" value='testbed-WINXP-SP2-pc3000-new' >
 <input type="submit" name="submit" value='Go!' >
 
+./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-TMP
+<form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
+<input type="text" name="node" value=''>
+<input type="hidden" name="imageid" value='testbed-WINXP-TMP' >
+<input type="submit" name="submit" value='Go!' >
+
 ./myboss.vulnelab.testbed.emulab.net/loadimage.php3?imageid=testbed-WINXP-UPD-pc3000-new
 <form action="https://myboss.vulnelab.testbed.emulab.net/loadimage.php3" method="post">
 <input type="text" name="node" value=''>
@@ -2759,8 +2823,6 @@
 <input type="file" name="exp_nsfile" size=30 />
 <input type="text" name="formfields[exp_localnsfile]" size=40 />
 <input type="textarea" name="nsdata" cols='100' rows='40' >
-<input type="checkbox" name="reboot" value='1' checked='1'>
-<input type="checkbox" name="eventrestart" value='1' checked='1'>
 <input type="submit" name="syntax" value='Syntax Check' disabled id=syntax >
 <input type="reset" >
 
@@ -2815,7 +2877,30 @@
 <input type="text" name="formfields[usr_phone]" value="(801) 123-4567" size=15>
 <input type="password" name="formfields[password1]" size=8>
 <input type="password" name="formfields[password2]" size=8>
-<input type="text" name="formfields[w_password1]" value="ES8/3asW" size=8>
+<input type="text" name="formfields[w_password1]" value="PK0kPw.z" size=8>
+<input type="text" name="formfields[w_password2]" size=8>
+<input type="checkbox" name="formfields[user_interface]" value="plab" >
+<input type="submit" name="submit" value="Submit" >
+
+./myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?target_uid=testusr2
+<form action="https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3" method="post">
+<input type="hidden" name="formfields[target_uid]" value="testusr2" size=8 maxlength=8>
+<input type="text" name="formfields[usr_name]" value="Test User 2" size=30>
+<input type="text" name="formfields[usr_title]" value="Tester" size=30>
+<input type="text" name="formfields[usr_affil]" value="Emulab Scripts" size=40>
+<input type="text" name="formfields[usr_URL]" value="http://www.emulab.net" size=45>
+<input type="hidden" name="formfields[usr_email]" value="never.confirm@nowhere.net" size=30>
+<input type="text" name="formfields[usr_addr]" value="Silly" size=45>
+<input type="text" name="formfields[usr_addr2]" value="Address" size=45>
+<input type="text" name="formfields[usr_city]" value="Salt Lake Silly" size=25>
+<input type="text" name="formfields[usr_state]" value="UT" size=2>
+<input type="text" name="formfields[usr_zip]" value="12345" size=10>
+<input type="text" name="formfields[usr_country]" value="USA" size=15>
+<input type="select" name="formfields[usr_shell]" value='sh' >
+<input type="text" name="formfields[usr_phone]" value="(801) 123-4567" size=15>
+<input type="password" name="formfields[password1]" size=8>
+<input type="password" name="formfields[password2]" size=8>
+<input type="text" name="formfields[w_password1]" value="B0zddh.B" size=8>
 <input type="text" name="formfields[w_password2]" size=8>
 <input type="checkbox" name="formfields[user_interface]" value="plab" >
 <input type="submit" name="submit" value="Submit" >
@@ -2845,7 +2930,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2868,7 +2953,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2891,7 +2976,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2914,7 +2999,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2937,7 +3022,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2960,7 +3045,7 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -2983,13 +3068,13 @@
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc25
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc109
 <form action="newimageid_ez.php3" enctype="multipart/form-data" method="post" name=idform>
 <input type="select" name="formfields[pid]" value=''>
 <input type="select" name="formfields[gid]" value=''>
@@ -2999,20 +3084,20 @@
 <input type="select" name="formfields[os_name]" value="none" >
 <input type="text" name="formfields[os_version]" value="" size=12 maxlength=12>
 <input type="text" name="formfields[path]" value="/proj/" size=50>
-<input type="text" name="formfields[node]" value="pc25" size=10 maxlength=10>
+<input type="text" name="formfields[node]" value="pc109" size=10 maxlength=10>
 <input type="checkbox" name="formfields[os_feature_ping]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ssh]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ipod]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc37
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc150
 <form action="newimageid_ez.php3" enctype="multipart/form-data" method="post" name=idform>
 <input type="select" name="formfields[pid]" value=''>
 <input type="select" name="formfields[gid]" value=''>
@@ -3022,20 +3107,20 @@
 <input type="select" name="formfields[os_name]" value="none" >
 <input type="text" name="formfields[os_version]" value="" size=12 maxlength=12>
 <input type="text" name="formfields[path]" value="/proj/" size=50>
-<input type="text" name="formfields[node]" value="pc37" size=10 maxlength=10>
+<input type="text" name="formfields[node]" value="pc150" size=10 maxlength=10>
 <input type="checkbox" name="formfields[os_feature_ping]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ssh]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ipod]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
 <input type="submit" name="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc4
+./myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[node]=pc157
 <form action="newimageid_ez.php3" enctype="multipart/form-data" method="post" name=idform>
 <input type="select" name="formfields[pid]" value=''>
 <input type="select" name="formfields[gid]" value=''>
@@ -3045,14 +3130,14 @@
 <input type="select" name="formfields[os_name]" value="none" >
 <input type="text" name="formfields[os_version]" value="" size=12 maxlength=12>
 <input type="text" name="formfields[path]" value="/proj/" size=50>
-<input type="text" name="formfields[node]" value="pc4" size=10 maxlength=10>
+<input type="text" name="formfields[node]" value="pc157" size=10 maxlength=10>
 <input type="checkbox" name="formfields[os_feature_ping]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ssh]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_ipod]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
 <input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
 <input type="select" name="formfields[op_mode]" value="none" >
-<input type="checkbox" name="formfields[mtype_pc600]" value="Yep" checked >
+<input type="checkbox" name="formfields[mtype_pc850]" value="Yep" checked >
 <input type="checkbox" name="formfields[wholedisk]" value="Yep" >
 <input type="text" name="formfields[max_concurrent]" value="" size=4 maxlength=4>
 <input type="checkbox" name="formfields[shared]" value="Yep" >
@@ -3125,23 +3210,23 @@
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3" method="post">
-<input type="text" name="node_id" value="pc25" size=10 maxlength=10>
+<input type="text" name="node_id" value="pc109" size=10 maxlength=10>
 <input type="select" name="log_type" value='misc' >
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3" method="post">
-<input type="text" name="node_id" value="pc37" size=10 maxlength=10>
+<input type="text" name="node_id" value="pc150" size=10 maxlength=10>
 <input type="select" name="log_type" value='misc' >
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/newnodelog_form.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3" method="post">
-<input type="text" name="node_id" value="pc4" size=10 maxlength=10>
+<input type="text" name="node_id" value="pc157" size=10 maxlength=10>
 <input type="select" name="log_type" value='misc' >
 <input type="text" name="log_entry" size=50 maxlength=128>
 <input type="submit" value="Submit" >
@@ -3269,36 +3354,33 @@
 <input type="text" name="tarballs" size="60" maxlength="1024" value="">
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer=" method="post">
-<input type="text" name="node_id" value="pc25" readonly >
-<input type="text" name="vname" value='node2' readonly >
-<input type="text" name="node_type" value="pc600" readonly >
-<input type="select" name="def_boot_osid" value='emulab-ops-RHL90-STD' >
+<input type="text" name="node_id" value="pc109" readonly >
+<input type="text" name="node_type" value="pc850" readonly >
+<input type="select" name="def_boot_osid" value='emulab-ops-FBSD410-STD' >
 <input type="text" name="def_boot_cmd_line" size="40" value="">
 <input type="text" name="startupcmd" size="60" maxlength="256" value=''>
 <input type="text" name="rpms" size="60" maxlength="1024" value="">
 <input type="text" name="tarballs" size="60" maxlength="1024" value="">
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer=" method="post">
-<input type="text" name="node_id" value="pc37" readonly >
-<input type="text" name="vname" value='tbsdelay0' readonly >
-<input type="text" name="node_type" value="pc600" readonly >
+<input type="text" name="node_id" value="pc150" readonly >
+<input type="text" name="node_type" value="pc850" readonly >
 <input type="select" name="def_boot_osid" value='emulab-ops-FBSD410-STD' >
-<input type="text" name="def_boot_cmd_line" value="/kernel.delay" size="40" >
+<input type="text" name="def_boot_cmd_line" size="40" value="">
 <input type="text" name="startupcmd" size="60" maxlength="256" value=''>
 <input type="text" name="rpms" size="60" maxlength="1024" value="">
 <input type="text" name="tarballs" size="60" maxlength="1024" value="">
 <input type="submit" value="Submit" >
 
-./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/nodecontrol_form.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/nodecontrol.php3?refer=" method="post">
-<input type="text" name="node_id" value="pc4" readonly >
-<input type="text" name="vname" value='node1' readonly >
-<input type="text" name="node_type" value="pc600" readonly >
-<input type="select" name="def_boot_osid" value='emulab-ops-RHL90-STD' >
+<input type="text" name="node_id" value="pc157" readonly >
+<input type="text" name="node_type" value="pc850" readonly >
+<input type="select" name="def_boot_osid" value='emulab-ops-FBSD410-STD' >
 <input type="text" name="def_boot_cmd_line" size="40" value="">
 <input type="text" name="startupcmd" size="60" maxlength="256" value=''>
 <input type="text" name="rpms" size="60" maxlength="1024" value="">
@@ -3378,29 +3460,24 @@
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc25
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc109
 <form action="https://myboss.vulnelab.testbed.emulab.net/powertime.php3" method="get">
-<input type="checkbox" name="nodes[]" value="pc25" checked>
+<input type="checkbox" name="nodes[]" value="pc109" checked>
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc37
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc150
 <form action="https://myboss.vulnelab.testbed.emulab.net/powertime.php3" method="get">
-<input type="checkbox" name="nodes[]" value="pc37" checked>
+<input type="checkbox" name="nodes[]" value="pc150" checked>
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc4
+./myboss.vulnelab.testbed.emulab.net/powertime.php3?node_id=pc157
 <form action="https://myboss.vulnelab.testbed.emulab.net/powertime.php3" method="get">
-<input type="checkbox" name="nodes[]" value="pc4" checked>
+<input type="checkbox" name="nodes[]" value="pc157" checked>
 <input type="checkbox" name="poweron" value="Yep" checked>
 <input type="submit" name="confirmed" value="Confirm" >
 
-./myboss.vulnelab.testbed.emulab.net/replayexp.php3?&pid=testbed&eid=testexp1
-<form action="https://myboss.vulnelab.testbed.emulab.net/replayexp.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
 ./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=fish
 <form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3" method="post">
 <input type="hidden" name="formfields[target_uid]" value="fish" >
@@ -3418,6 +3495,15 @@
 <input type="password" name="formfields[password]" size=12>
 <input type="submit" name="submit" value='Add New Keys' >
 
+./myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?target_uid=testusr2
+<form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3" method="post">
+<input type="hidden" name="formfields[target_uid]" value="testusr2" >
+<input type="hidden" name="MAX_FILE_SIZE" value="4096" >
+<input type="file" name="usr_keyfile" value="" size=50>
+<input type="text" name="formfields[usr_key]" value="" size=50 maxlength=1024>
+<input type="password" name="formfields[password]" size=12>
+<input type="submit" name="submit" value='Add New Keys' >
+
 ./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=fish
 <form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3" method="post">
 <input type="hidden" name="formfields[target_uid]" value="fish" >
@@ -3431,6 +3517,13 @@
 <input type="password" name="formfields[password]" size=8>
 <input type="submit" name="submit" value='Add New Key' >
 
+./myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?target_uid=testusr2
+<form enctype=multipart/form-data action="https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3" method="post">
+<input type="hidden" name="formfields[target_uid]" value="testusr2" >
+<input type="text" name="formfields[usr_key]" value="" size=70 maxlength=1024>
+<input type="password" name="formfields[password]" size=8>
+<input type="submit" name="submit" value='Add New Key' >
+
 ./myboss.vulnelab.testbed.emulab.net/showsumstats.php3
 <form action="showsumstats.php3" method="get">
 <input type="text" name="range" value="mm/dd/yy-mm/dd/yy" >
@@ -3844,18 +3937,13 @@
 <input type="hidden" name="sortby" value="uid" >
 <input type="submit" name="search" value="Search" >
 
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp2
-<form action="swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp2" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=out&pid=testbed&eid=testexp1
-<form action="swapexp.php3?inout=out&amp;pid=testbed&amp;eid=testexp1" method="post">
+./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp1
+<form action="swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp1" method="post">
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
-./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=restart&pid=testbed&eid=testexp1
-<form action="swapexp.php3?inout=restart&amp;pid=testbed&amp;eid=testexp1" method="post">
+./myboss.vulnelab.testbed.emulab.net/swapexp.php3?inout=in&pid=testbed&eid=testexp2
+<form action="swapexp.php3?inout=in&amp;pid=testbed&amp;eid=testexp2" method="post">
 <input type="submit" name="confirmed" value="Confirm" >
 <input type="submit" name="canceled" value="Cancel" >
 
@@ -3876,26 +3964,3 @@
 <input type="submit" name="canceled" value="Cancel" >
 <input type="hidden" name="nodeid" value="ops" >
 
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc25
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-<input type="hidden" name="nodeid" value="pc25" >
-
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc37
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-<input type="hidden" name="nodeid" value="pc37" >
-
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1&nodeid=pc4
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-<input type="hidden" name="nodeid" value="pc4" >
-
-./myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?pid=testbed&eid=testexp1
-<form action="updateaccounts.php3?pid=testbed&amp;eid=testexp1" method="post">
-<input type="submit" name="confirmed" value="Confirm" >
-<input type="submit" name="canceled" value="Cancel" >
-
diff --git a/www/sec-check/site_normal.urls b/www/sec-check/site_normal.urls
index 0bc2d0bf1192adba66c52bf762d0bc9bfeefb15c..4c5ee797c04129e7a753a0d870fb9b0b8d849f3f 100644
--- a/www/sec-check/site_normal.urls
+++ b/www/sec-check/site_normal.urls
@@ -4,16 +4,14 @@ https://myboss.vulnelab.testbed.emulab.net/archive_tag.php3?exptidx=1
 https://myboss.vulnelab.testbed.emulab.net/archive_tags.php3?exptidx=1
 https://myboss.vulnelab.testbed.emulab.net/archive_missing.php3?exptidx=1
 post:https://myboss.vulnelab.testbed.emulab.net/boot.php3?confirmed=Confirm&node_id=pc4
-post:https://myboss.vulnelab.testbed.emulab.net/delaycontrol.php3?dochange=1&eid=testexp1&pid=testproj&modbase=1
 post:https://myboss.vulnelab.testbed.emulab.net/editexp.php3?formfields[mem_usage]=0&formfields[batchmode]=1&formfields[idleswap_timeout]=4&submit=Submit&formfields[autoswap]=1&formfields[autoswap_timeout]=10&formfields[noidleswap_reason]=Testing.&eid=hwdown&formfields[cpu_usage]=3&formfields[idleswap]=0&formfields[linktest_level]=0&formfields[description]=Descriptive text.&pid=emulab-ops
 post:https://myboss.vulnelab.testbed.emulab.net/editgroup.php3?testuser$$trust=local_root&add_testuser=permit&gid=testgroup&pid=testproj
-post:https://myboss.vulnelab.testbed.emulab.net/editimageid.php3?formfields[mtype_pc600]=Yep&formfields[path]=/proj/testbed/images/FBSD-RON.ndz&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive text.
+post:https://myboss.vulnelab.testbed.emulab.net/editimageid.php3?formfields[path]=/proj/testbed/images/FBSD-RON.ndz&formfields[mtype_pc850]=Yep&submit=Submit&imageid=emulab-ops-FBSD-RON&formfields[description]=Descriptive text.
 https://myboss.vulnelab.testbed.emulab.net/feedback.php3?mode=clear&confirmed=Confirm&clear_last=1&eid=testexp1&clear_bootstrap=1&pid=testproj
 post:https://myboss.vulnelab.testbed.emulab.net/gensslcert.php3?formfields[passphrase1]=EinE_tmp&submit=Create SSL Cert&formfields[passphrase2]=EinE_tmp&formfields[target_uid]=testuser
 post:https://myboss.vulnelab.testbed.emulab.net/kb-manage.php3?formfields[xref_tag]=test_tag&formfields[title]=Test title.&submit=Submit&formfields[section]=none&formfields[body]=Test body.&formfields[faq_entry]=0&formfields[new_section]=test_section
-post:https://myboss.vulnelab.testbed.emulab.net/linktest.php3?level=0&eid=testexp1&pid=testproj
 post:https://myboss.vulnelab.testbed.emulab.net/loadimage.php3?node=pc4&submit=Go!&imageid=emulab-ops-RHL90-STD
-post:https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3?nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp1&eventrestart=1&pid=testbed&reboot=1
+post:https://myboss.vulnelab.testbed.emulab.net/modifyexp.php3?nsdata=&MAX_FILE_SIZE=1024&go=1&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&eid=testexp1&pid=testbed
 post:https://myboss.vulnelab.testbed.emulab.net/moduserinfo.php3?formfields[usr_country]=USA&formfields[user_interface]=plab&formfields[usr_city]=Salt Lake Silly&formfields[usr_affil]=Emulab Scripts&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test User&submit=Submit&formfields[usr_addr]=Silly&formfields[target_uid]=testuser&formfields[notes]=&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_phone]=801-123-4567&formfields[w_password1]=;lkjasdf&formfields[usr_zip]=12345&formfields[w_password2]=&formfields[usr_shell]=sh&formfields[usr_addr2]=Address&formfields[usr_title]=Tester
 post:https://myboss.vulnelab.testbed.emulab.net/newnodelog.php3?log_type=misc&log_entry=Test log entry.&node_id=pc4
 https://myboss.vulnelab.testbed.emulab.net/newnodes_list.php3?remap[4]=&remap[5]=&newprefix=&remap[6]=&newtype=&create=Create selected nodes&remap[0]=&remap[1]=&remap[2]=&remap[3]=&addnumber=
@@ -22,10 +20,9 @@ post:https://myboss.vulnelab.testbed.emulab.net/nscheck.php3?MAX_FILE_SIZE=1024&
 https://myboss.vulnelab.testbed.emulab.net/nsgen.php3?template=plabdevbox&templatevalues[ImageName]=PLAB-DEVBOX&templatevalues[NodeName]=devbox&templatevalues[HWType]=pc
 https://myboss.vulnelab.testbed.emulab.net/plab_ez.php3?formfields[count]=10&formfields[when]=52&submit=Create it&formfields[type]=pcplab&formfields[canfail]=Yep&formfields[units]=168&formfields[resusage]=3
 https://myboss.vulnelab.testbed.emulab.net/powertime.php3?nodes[]=pc4&poweron=Yep&confirmed=Confirm
-post:https://myboss.vulnelab.testbed.emulab.net/replayexp.php3?confirmed=Confirm&eid=testexp1&pid=testbed
 post:https://myboss.vulnelab.testbed.emulab.net/showpubkeys.php3?MAX_FILE_SIZE=1024&formfields[target_uid]=testuser&formfields[usr_key]=
 post:https://myboss.vulnelab.testbed.emulab.net/showsfskeys.php3?formfields[target_uid]=testuser&formfields[usr_key]=
 https://myboss.vulnelab.testbed.emulab.net/showsumstats.php3?sortby=pdays&range=mm/dd/yy-mm/dd/yy&showby=users
 post:https://myboss.vulnelab.testbed.emulab.net/showuser_list.php3?sortby=uid&searchfor=&showtype=loggedin
-post:https://myboss.vulnelab.testbed.emulab.net/swapexp.php3?confirmed=Confirm&eid=testexp2&inout=in&pid=testbed
+post:https://myboss.vulnelab.testbed.emulab.net/swapexp.php3?confirmed=Confirm&eid=testexp1&inout=in&pid=testbed
 post:https://myboss.vulnelab.testbed.emulab.net/updateaccounts.php3?confirmed=Confirm&eid=opsnodes&nodeid=pc4&pid=emulab-ops
diff --git a/www/sec-check/site_setup.urls b/www/sec-check/site_setup.urls
index 1849a8776c3e2a1fe0580458a36a5def422b7030..6a7e9eea1b67982a2797d130e6633337aabaaac4 100644
--- a/www/sec-check/site_setup.urls
+++ b/www/sec-check/site_setup.urls
@@ -2,7 +2,7 @@ post:https://myboss.vulnelab.testbed.emulab.net/newproject.php3?formfields[proj_
 post:https://myboss.vulnelab.testbed.emulab.net/joinproject.php3?formfields[usr_country]=USA&MAX_FILE_SIZE=1024&formfields[usr_city]=Salt Lake Silly&formfields[usr_affil]=Emulab Scripts&formfields[wikiname]=TestUser&formfields[gid]=&formfields[pid]=testproj&formfields[usr_state]=UT&formfields[usr_URL]=http://www.emulab.net&formfields[usr_name]=Test User&submit=Submit&formfields[usr_addr]=Silly&formfields[password1]=EinE_tmp&formfields[usr_email]=fish@flux.utah.edu&formfields[password2]=EinE_tmp&formfields[usr_key]=&formfields[usr_phone]=801-123-4567&formfields[usr_zip]=12345&formfields[joining_uid]=testuser&formfields[usr_addr2]=Address&formfields[usr_title]=Tester
 post:https://myboss.vulnelab.testbed.emulab.net/beginexp_html.php3?formfields[exp_autoswap_timeout]=16&formfields[exp_noswap_reason]=&formfields[exp_id]=testexp1&beginexp=Submit&formfields[exp_noidleswap_reason]=Testing.&formfields[exp_idleswap_timeout]=4&MAX_FILE_SIZE=1024&formfields[exp_batched]=Yep&formfields[exp_swappable]=1&formfields[exp_preload]=Yep&formfields[exp_savedisk]=Yep&formfields[exp_description]=Test experiment.&formfields[exp_linktest]=0&formfields[exp_gid]=&formfields[exp_pid]=testproj&formfields[exp_localnsfile]=/users/fish/shaped-2-nodes.ns&formfields[exp_autoswap]=1&formfields[exp_idleswap]=0
 post:https://myboss.vulnelab.testbed.emulab.net/newgroup.php3?group_id=&group_description=&group_leader=fish&group_pid=testproj
-post:https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[mtype_pc600]=Yep&formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc4&formfields[description]=Descriptive text.&formfields[imagename]=&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none
+post:https://myboss.vulnelab.testbed.emulab.net/newimageid_ez.php3?formfields[os_feature_linktest]=checked&formfields[os_feature_ping]=checked&formfields[path]=/proj/&formfields[mtype_pc850]=Yep&formfields[os_version]=&formfields[gid]=&formfields[pid]=testproj&formfields[os_feature_ssh]=checked&submit=Submit&formfields[os_name]=none&formfields[loadpart]=X&formfields[node]=pc4&formfields[description]=Descriptive text.&formfields[imagename]=&formfields[shared]=Yep&formfields[wholedisk]=Yep&formfields[os_feature_isup]=checked&formfields[os_feature_ipod]=checked&formfields[max_concurrent]=&formfields[op_mode]=none
 post:https://myboss.vulnelab.testbed.emulab.net/newmmlist.php3?formfields[listname]=&formfields[pid]=testproj&submit=Submit&formfields[password1]=EinE_tmp&formfields[password2]=EinE_tmp&formfields[fullname]=
 post:https://myboss.vulnelab.testbed.emulab.net/newosid.php3?os_feature_isup=checked&os_magic=&os_path=&os_version=&os_feature_ping=checked&os_feature_ipod=checked&OS=Linux&os_feature_linktest=checked&op_mode=NORMALv2&description=&os_feature_ssh=checked&osname=&pid=testproj
 post:https://myboss.vulnelab.testbed.emulab.net/template_create.php?MAX_FILE_SIZE=1024&formfields[tid]=&formfields[localnsfile]=&formfields[gid]=&formfields[pid]=testproj&create=Create Template&formfields[description]=Descriptive text.
diff --git a/www/sec-check/success.txt b/www/sec-check/success.txt
index 109d0d301172d4a6e619ced544c737acfa5fa868..d5cc3a37c0587c3e820e929c898a4c92a1567d6b 100644
--- a/www/sec-check/success.txt
+++ b/www/sec-check/success.txt
@@ -14,3 +14,6 @@ Snapshot Node Disk into Existing Image Descriptor
 Knowledge Base Entry:
 Your new SSL certificate has been created
 Log for node
+Commit/Tag Archive
+has been deleted
+let's be sure