updated TODOs (should probably work on them someday)