Wrap ms and make minor edits
Merge branch 'master' of github.com:seananderson/ss3sim