added todo and fixed small typos