Bugfixes and small changes to calibration script. Scripts are now
successfully tested on the NikonII.