fotf: done
Incorporate Dan's corrections