Moved debug output in net
Merged in changes to net handler