make analysis use speech objects rather than dicts
fix merge conflict