Bit of a tidy and add in code to use yarr (initiall to update the
generalized co-ordinates).