handled location off on starting app
fixed merging errors