Making some analysis changes, improvements.