added  a couple of TODOs