Tweaks to prevent variable[ collisions, proper permissions