added additional devices; minor fixes