tidying up
added DeviceType table