Sorry, i cant help with BF and AF hasnt returned.

Yes, take the calcium/magnesium tablets and follow the diet the best you can.
I am at the moment and it is not at all what i normally eat or like (hence - i have 3 boys)

Goodluck !