fixed sms and removed location