more bug fixes related to tutor functionality