adding final tweaks