Minor fixes. Everything's apparently working.
Merge branch 'master' of https://github.com/Fichberg/NetSim