Added 'additional marketing' screens and adjusted payment bit to
take them into account.
Various minor bug fixes, lang strings etc.