Update LONG-TERM-TODO, SHORT-TERM-TODO