minor tweakings