fixed delivery date; added auto-increment on return