TODOlist + hotfix