Some mroe changes to networking