For an upset stomach, you might want to try mint. I usually have peppermint tea and it seems to help. Even some gum has helped in the past.
For bad heartburn, I usually drink milk (which is odd because sometimes milk by itself will upset my stomach). It coats my stomach and meks me burp, feeling much better
Hope this helps