Update and fine tune the tutorial a bit.