Is my prayer valid, considering my performance of supererogatory prayers before and after the obligatory prayers, and are the two rak'ahs with witr and shaf' included in the night vigil (qiyam), and are supererogatory prayers performed after the adhan?

The two rak'ahs of Fajr prayer after its adhan are valid and are called "ar-Raghibah." As for performing supererogatory prayers after the Subh (dawn) prayer, it is disliked until the sun rises and elevates. The four rak'ahs of the pre-Dhuhr sunnah prayer are performed before Dhuhr, and it is recommended to pray four rak'ahs before Asr. Performing supererogatory prayers before Maghrib, after its time has entered, is sunnah. The Witr and Shafa' prayers are considered part of performing the night vigil (qiyam al-layl). There are no supererogatory prayers after the final Fajr adhan except the two rak'ahs of Fajr. However, after other adhans, supererogatory prayers are recommended without limit. A Muslim may pray supererogatory prayers whenever they wish, except during the prohibited times.