deliveries + fixes