Fixing multiple issues concerning SMS

Closes #478
Closes #477
Closes #348