Better error handling.
Cleaning
Updated notes
Merge branch 'master' of github.com:PofMagicfingers/Tasks