Updates to analysis, code for datadump.