Fixed TODO notes