stabilizing a bit

Network is still down, checkout commit from yesterday