NavCalc updated. Still crashes though!