final corrections part 1
After talk with Todd