Fixes unstable results and side effects, improves plugin demo data