Fix bug in analysis, give results class nicer fields.