Improved tutorial. Changed some internal names.