Offer Salah or Tawaf while you

Q: I attained puberty when I was fourteen years old. Two years later, I performed Hajj. At that time, I did not know the difference between Madhy (pre-seminal fluid) and Maniy (spermatic fluid) even though I knew that it is obligatory to perform Ghusl (ritual bath) when Maniy is discharged and that it is sufficient to perform Istinja' (cleansing the private parts with water) and Wudu' when Madhy is emitted, then the person can pray. Sometimes, when I find Madhy, I perform Ghusl thinking that it is Maniy.During Hajj and before Tawaf-ul-Ifadah (final obligatory circumambulation of the Ka`bah in Hajj), I found some fluid on my underpants resulting from looking and having sexual thoughts. I was confused whether it was Maniy that requires Ghusl or Madhy in which state it will be sufficient for me to perform Istinja' and Wudu'. However, I said to myself if I was at home, I would have performed Ghusl to be on the safe side. However, perhaps it might be Madhy for I heard that it is emitted when sexual desire is stirred or when the person thinks of sex. (Part No. 11; Page No. 243) Hence, I made Istinja' and Wudu' and performed Tawaf-ul-Ifadah. Later, I knew the difference between Madhy and Maniy.What is the ruling on this Hajj? Taking into consideration that it is the obligatory Hajj and I have performed Hajj again but with the intention of performing supererogatory Hajj. I also performed Tawaf but not during the month of Hajj with the intention of making up for the Tawaf-ul-Ifadah that I performed during which I was not in a state of Taharah (ritual purification). I also fed six needy people as an expiation of the emission of Maniy during Hajj. What should I do? What is the ruling on the Salah offered during this period for I was, thanks to Allah, offering them in full? What is the ruling on the three or four `Umrahs which I offered during this period?May Allah protect you and grant you all success!