lots of changes. working triangulation, calibration. lots of renames