Updates

Update stupid to make MessageSample functions self-contained, update
UserSurvival to be more transparent in what it's doing.