Apply Carl's corrections and stuff to add