renaming images and some tweaks