minor; comments and todo