Various changes from Chris and myself.