minor bug fixes and performance improvents

+ narrowed down plugin content rights