Changed totals calculation, fixed Delivery form constructor