Various updates. Now can really run a full analysis.