add TODO and some fixes