Add schools and bug-fix
Add all for instructors