some important TODOs were added