Noti updated, location mode improved