Fix DeliveredAmount handling.
Fixes for Amount class, new features.
Fix DeliveredAmount reading.