adding NetworkError
internal fixes to ip()
removed last remaining references to old names