some corrections, used device errors