Added more devices, mixingised things a bit