Extensive updates to recorder.