Exchange: Added expense events, tweaked payment events, other minor tweaks