Adding some of the config stuff. Binh-Minh should go through the others (and these) to see if they are correct.