Add tasks and bugfixes