add a couple of TODOs