Fixed some silly bugs, and made slow progress towards calibrating the camera rig