TODO and vim update