Some fine tunings for me