Minimized critical section
More debugging
Merge branch 'routing' of https://github.com/kutagh/NetChange into routing