Commiting changes from yesterday

These are changes that were lost yesterday when my commit failed and I
unsuccessfully tried to recover. I lost some other pages. Also I can't
build due to something with YAF.