fixed #15
fixed #16 and finished reorder for universities