Fix network bug
some tweaks