Bug fixes
Improve logging
Fix task orchestrating