fr: adding plugin diagram overlay and other fixes