Cleaned up histories to produce evo histories plus cleaned out some underlying bugs