Added comments
Fix for transaction issues with updateing Tasks
Cleaned up FIXME messages