minor changes plus added todo