added more devices, fixed network issue