Fixed Todo model
some more stuff