fixed stuff and add TODOs