All but expiration logic and notification fix.