even more bugfixes

We are commiting so often so we test cross-network behavoir