make it prettier with conceal on and smarter on ESC