few adjustement, cleanup