fixes in tutorial and also code changes from last 6 months