Minor optimizations, removed WorldPlugin from defaults, fixed demo.py