minor changes and some TODOs
another todo