test mode for vision
minor changes
Merge origin/master