Fix shipment notifications, timer, updateTimer, display, ...