Updated a couple of todo's