Small fixes.
New tasks.