some fix and refine plugin