Completed a fiew TODOs

Hi Jake!

I just completed a few minor TODOs. Let me know if you have any comments :)

Alex