Have I got this second part right?
You mean, I presume, \dot{r}, not r, on the left of both of those two equations. Now, how did you get "-1" on the right of the last equation? It looks to me like you have r on the right of both first two equations. Isn't r- r= 0?