Modified TODO and other small changes