minor changes to vision state machine
Merge branches 'version3' and 'temp' into version3