reloaded files w correct encoding and misc changes