just use Network enum from proto + misc. fixes