Fixing notification distance calculations, re-adding all deliveries, #185