fix bug scaffolding + advancement of tutorial