Minor tweaks and updated file permissions