add TODOs and a few minor fixes