Corrections and Todos

Bugs in the tutorial
Fixes for test run
Added note about manager_type