big changes, fixed image warping, restructuring search