made a few adjustments