Improve tutorial and some other small parts