Fixed and Tweaks on Finish.