fixed permission stuff
merge