Fixes.
Merge pull request #24 from lwade/master

Fixes in register variables and names of tasks