merged changes from Dan, Cleo, and my files.