minor changes; still trying to calibrate correctly