More fixes, recording basically works again...