Add TODO and WARNING comments