finished,few more tweaks