Notifications cleaned up, and order completion notice added