Update full derivatives and tidy code.
Don;t normalise V