Tweaks and finalizing