further plugin improvements
further plugin improvements