Made more changes and think we are finished.