Fixed excessive notification bug
Fixed location stalling