Improved some tutorial examples