Some changes from lab feedback