Cleanup, more networking functionality