Small updates, devices list now correct