changed TODOs (re-did changes messed up before)