diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..2c454b6da97d90cce1f5b77e207b84732c6ed814
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+netns
+mininet.egg-info
diff --git a/mininet/node.py b/mininet/node.py
index 6a328024ae4beff57e25f258e1487bc6a91d86ad..1d00e299024e44d8b1d8ccb0e2ccd766bdc75508 100644
--- a/mininet/node.py
+++ b/mininet/node.py
@@ -457,7 +457,7 @@ def start( self, controllers ):
         quietRun( 'ovs-dpctl del-dp dp%i' % self.dp )
         self.cmd( 'ovs-dpctl add-dp dp%i' % self.dp )
         if self.defaultMAC:
-            intf = 'dp' % self.dp
+            intf = 'dp%i' % self.dp
             mac = self.defaultMAC
             self.cmd( [ 'ifconfig', intf, 'hw', 'ether', mac ] )
 
diff --git a/util/deb/install_mn_deps.sh b/util/deb/install_mn_deps.sh
index 834044fa85d6e902b725939c14f9b4083ac9a625..100315f1dd8f69a5f4e2e30902a778826e7b25f2 100755
--- a/util/deb/install_mn_deps.sh
+++ b/util/deb/install_mn_deps.sh
@@ -5,17 +5,8 @@
 #Install dependencies:
 sudo apt-get install -y screen psmisc xterm ssh iperf iproute python-setuptools
 
-#Get the source, with the customtopos branch (for now, this should be removed shortly):
-git clone git@yuba.stanford.edu:mininet.git
-cd ~/mininet
-git checkout -b customtopos origin/customtopos
-
 #Add sysctl parameters as noted in the INSTALL file to increase kernel limits to support larger setups:
-sudo su -c "cat /home/mininet/mininet/sysctl_addon >> /etc/sysctl.conf"
+sudo su -c "cat /home/mininet/mininet/util/sysctl_addon >> /etc/sysctl.conf"
 
 #Load sysctl settings:
-sudo sysctl -p
-
-#Reboot to ensure you start with higher limits and verify that the IPv6 module is not loaded, plus there's an unknown issue where you need to reboot before the kernel datapath will get added (sorry).
-sudo reboot
-
+sudo sysctl -p
\ No newline at end of file
diff --git a/util/deb/install_nox.sh b/util/deb/install_nox.sh
index b1ef8575399ba3cbe60b96b1c7a9bfa147d275e6..f7838acb2a36b7bf01aaada21c07e7e5eab79a49 100755
--- a/util/deb/install_nox.sh
+++ b/util/deb/install_nox.sh
@@ -2,12 +2,6 @@
 #Brandon Heller (brandonh@stanford.edu)
 #Install NOX on Debian Lenny
 
-#Install NOX deps:
-sudo apt-get -y install autoconf automake g++ libtool python python-twisted swig libboost1.35-dev libxerces-c2-dev libssl-dev make
-
-#Install NOX optional deps:
-sudo apt-get install -y libsqlite3-dev python-simplejson
-
 #Install NOX:
 git clone git://noxrepo.org/noxcore
 cd noxcore
@@ -19,4 +13,4 @@ make
 #make check
 
 #Add NOX_CORE_DIR env var;; modify ~/.bashrc:
-sudo sed -i -e 's|# for examples$|&\ncomplete -cf sudo|' ~/.bashrc
\ No newline at end of file
+sed -i -e 's|# for examples$|&\ncomplete -cf sudo|' ~/.bashrc
\ No newline at end of file
diff --git a/util/deb/install_nox_deps.sh b/util/deb/install_nox_deps.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b051ecf0d7295893dff8cdf7fc1b5f69f94e1e93
--- /dev/null
+++ b/util/deb/install_nox_deps.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Install NOX deps on Debian Lenny
+
+#Install NOX deps:
+sudo apt-get -y install autoconf automake g++ libtool python python-twisted swig libboost1.35-dev libxerces-c2-dev libssl-dev make
+
+#Install NOX optional deps:
+sudo apt-get install -y libsqlite3-dev python-simplejson
\ No newline at end of file
diff --git a/util/deb/install_ovs.sh b/util/deb/install_ovs.sh
index a9ea88d503d53630789de349a36bf111d3cf2bcc..14df05635eefd22d5101a23de6c654ecaaee5ab6 100755
--- a/util/deb/install_ovs.sh
+++ b/util/deb/install_ovs.sh
@@ -2,31 +2,9 @@
 #Brandon Heller (brandonh@stanford.edu)
 #Install OVS on Debian Lenny
 
-#The following files were useful for the install process:
-#OVS INSTALL file:
-#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.Linux;hb=HEAD
-
-#OVS OpenFlow INSTALL file:
-#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.OpenFlow;hb=HEAD
-
-#OVS README file:
-#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=README;hb=HEAD
-
-#Install Autoconf 2.63 from source (a more recent version than that in the Deb repositories is required).  This should be the only extra dependency.
-cd ~/
-wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2
-tar xjf autoconf-2.63.tar.bz2
-cd autoconf-2.63/
-./configure
-make
-sudo make install
-cd ~/
-rm -rf autoconf*
-
 #Install OVS:
 git clone git://openvswitch.org/openvswitch
 cd openvswitch
 ./boot.sh
 ./configure --with-l26=/lib/modules/`uname -r`/build
-make
-sudo make install
\ No newline at end of file
+make
\ No newline at end of file
diff --git a/util/deb/install_ovs_2.sh b/util/deb/install_ovs_2.sh
new file mode 100755
index 0000000000000000000000000000000000000000..30ebbf540f5629cf721f1f57867210a3b3ffaffb
--- /dev/null
+++ b/util/deb/install_ovs_2.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Install OVS on Debian Lenny
+
+#Install OVS:
+cd openvswitch
+sudo make install
\ No newline at end of file
diff --git a/util/deb/install_ovs_deps.sh b/util/deb/install_ovs_deps.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2cc911fea523276323f92ebf0c8938d82fd288fb
--- /dev/null
+++ b/util/deb/install_ovs_deps.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Install OVS deps on Debian Lenny
+
+#The following files were useful for the install process:
+#OVS INSTALL file:
+#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.Linux;hb=HEAD
+
+#OVS OpenFlow INSTALL file:
+#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.OpenFlow;hb=HEAD
+
+#OVS README file:
+#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=README;hb=HEAD
+
+#Install Autoconf 2.63+ backport from Debian Backports repo:
+#Instructions from http://backports.org/dokuwiki/doku.php?id=instructions
+sudo apt-get -y install debian-backports-keyring
+sudo su -c "echo 'deb http://www.backports.org/debian lenny-backports main contrib non-free' >> /etc/apt/sources.list"
+sudo apt-get update
+sudo apt-get -y -t lenny-backports install autoconf
\ No newline at end of file
diff --git a/util/deb/install_tools.sh b/util/deb/install_tools.sh
index 07d3740759dd9b53afd0cb6d9ea4920308bc1326..84559cd5bf0764b05938f854da269b1efb13c66a 100755
--- a/util/deb/install_tools.sh
+++ b/util/deb/install_tools.sh
@@ -5,3 +5,8 @@
 #Install tcpdump and tshark, cmd-line packet dump tools.  Also install gitk,
 #a graphical git history viewer. 
 sudo apt-get install -y tcpdump tshark gitk
+
+#Set git to colorize everything.
+git config --global color.diff auto
+git config --global color.status auto
+git config --global color.branch auto
\ No newline at end of file
diff --git a/util/deb/vm_clean.sh b/util/deb/vm_clean.sh
new file mode 100755
index 0000000000000000000000000000000000000000..155eb091cc02b4ae6dd9583153d0bbd2e0970145
--- /dev/null
+++ b/util/deb/vm_clean.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Clean up after VM installation
+
+sudo apt-get clean
+sudo rm -rf /tmp/*
+history -c
+rm ~/.ssh/id_rsa*
+sudo rm ~/.ssh/authorized_keys2
+sudo rm -rf ~/mininet
\ No newline at end of file