minor changes
over/out/disable states fix
Merge branch 'develop'