File rename and some tweaks