Refine fig script and figures