minor linguestic fix
add Semester admin
fix confilicts