multiple marketing bug fixes