Added partner info to notification and refactored a couple of things.