check tutorial and make some fixes