some fixes to tutorial code
fix merge
set the workspace