adding TODOs and cleaning some stuff up