Recording feature is in, switched to tb_peakcomp~ and patch tidying