a few network improvements