Many fixes to recording...  Still needs more testing though...