Updated loading of regional files, minor fixes