network_mode support, bugfixes