editted todolist, solved some todo's,