Tutorial part 1; small fixes