Were all these discharges menses or istihadah, and which days from them must be made up?

If the bleeding period and the purity interspersed within it exceed fifteen days, and the period between the two bleeding spells is not less than the minimum period of purity (thirteen days), then that is Istihada (non-menstrual vaginal bleeding). Only what coincides with the habitual time is considered menses, and anything else is Istihada. Your fasting and prayers during the time of Istihada are valid, and you are not required to make up for any fasts except those you broke, or those you fasted during the time counted as menses.