tutorial improvement / many many fixes