minor fine tunings