more robot tweaking
Merge branch 'master' into station3
robot tweaking and cleanup