Fine tunings

My suggestions