several improves in locator and files handler