multiple marketing bug fixes
Merge pull request #972 from pennij/working

multiple marketing bug fixes