fix modes, voltage change timeout
Merge branch 'Nima-Ghods' into NEW-MASTER