Modified todos a little