added teacher and student and improved options