some final fixes
move school in map