major network renovations, fixes #4