improve quality of function in Teacher mode & GUI