Changed some Todo stuff