Restored default task, minor bugfixes