some bugfixes and some more network prepping