some bug fixes while testing on the robot