Cleanup and minor fixes
Use the main recorder also for IME + cleanup