updated autoLocate. some file cleaning