If you use Oxygen bleach, it is a deodorizer too, so that should eliminate all your problems.
I found a family owned company on the net called Natural Choices. Everything they sell is environment safe, non-toxic and works better than all the other leading brands of junk chemicals. Look up Oxyboost, or Natural Choices. Shipping is fast, cheap and everything is 100% guaranteed. ( They also sell fabric softening dryer sheets but I have not tried them yet! )