Added net-tools (for ifconfig) and cleaned up some code