few changes to locations stuff.
reducing error in unlink