added todo
minor changes