streamrecord remake + cleanup