I think I fixed all the problems.  All that's left is to try it on the Robot.