minor, some comments with TODOs