added error messages
fixed error with location tracking