committing recent kelsey changes- sorry about all the extra files.