fixes to location,segment adding and notifiee implementation - change to a
list later