More packaging and cleanup.