slight tweakings