Update TODO and windows batch script