sandboxing stuff - tweak a few things