improvements on tutorial