Updating to latest fixes orphaned students
Better teacher swap handling