Added ToDo & Fixed some stuff