some minor fine tuning.