Should have been part of the last commit.
Fix stopRecording plus some cleanup.