Numerous bugfixes and task list items