several tweakings