Some changes after reading the full thing out.