Various day 1 changes based on Sam's feedback