finalizing tweaks