More SBSMS fixes/improvements...