Added some todos (anyone is free to fix these, I just write my name so that you can see who came up with them in case they're unclear!)