add some sparse comments and TODOs