Design changes and fixes.
Update task fix.