Added smsNumber support; minor cleanup