lots of updates to 'Analysis 2'