some minor tweakings