Added perms + minor tweaks