bugfix and Networkstuff