Small fixes and new tasks.