misc improvements
Attempt to fix sandboxing