Updated a few TODOs for myself throughout the code.