update for TODO and FIXME