Location data change + general tweaks