small fix and a TODO