permissions and other minor changes