some cleanup; adds stuff for day1