Did some more TODOS.
All finished TODOS are repalce with DONE =)

(ich frag mich ob das alles am ende Funktioniert >.<)