Updated tutor with bug fixes