revised TODO and added code comments, only