plugin improvements