Made lots of changes. Too many to mention.