few improvements

can work on multi-decives