small fix, and updated TODO