Fix bugs from v0.3.0; Speed up recording