a few adjustements