day 3, and some clean-up