making swap public
adding tweak to avoid crash when tools or modes folders are inaccessible