Updated a few todo's