Move some TODO items from README.md to comments in the relevant modules