small plugin improvements
small plugin improvements