For the first part you will need to change variables in an equation.You will need to use this idea:

df
dr
= df
du
du
dr
For the second part, you need to redefine your angle by shifting it by a certain amount.