Making the things work and more in the tutorial too