Aslm.
For the tahajjud one, maybe add the location that we stay and change the location when we are in a different places. Also, add the timer because I didn't know how to count the timer for tahajjud. Ok I think that's all. I hope you make my request come true w the help of Allah...