Reworked parts of the tutorial