Added net.stop, other improvements