improvements on Tutorial