Added remove functionality for locations.
Added minor error checking in add location.