Hajj & Umrah

Woman earning more reward for performing ibaadah in her hotel room when going for umrah

Q: With regards to women performing Umrah, I've been advised that it's preferred they make ibaadah individually. However, my question is if a woman has the correct intentions and adopts strict pardah and makes tawaaf and performs salaah in the Haram Shareef, is she rendered sinful in this regard?

Will a person be a musaafir or muqeem when staying in Makkah and Aziziyyah?

Q: Insha Allah I have intention for Hajj. So we leave on the 28th of April from JHB. 

We'll be 10 days in Makkah

Then 12 days in Azzizia

Then 6 days of Hajj 

Then another 6 days in Azzizia. 

So what I want know is where am I musaafir in this whole trip and where am I muqeem? Do I regard Makkah and Azzizia as 1 or what?