Colleen's changes and a turbulence patch.
Got rid of a junk file.