Continue Todo-List + a lot of bugfix