flat, finalizing l10n and marketplace messages. Will merge with master now :)