Smaller Bugfix and Renaming TASKS_TABLE