Remove some TODO and improve editor