Some more changes from the last day of class