...one more comment. You should both get tested for STDs because you have had multiple partners in the past. Going forward you should decide whether or not to get tested annually as long as you are in this relationship.
The bumps sound like fordyce spots. They are probably unrelated to the discharge and smell.
The discharge should be checked out by a doctor.
It could be a yeast infection, an std, etc. The only way you'll know for sure is to see your doctor and get tested.
Feel better,
Aj