Reordered day 2; minor fixes