fixed EDU-301 and some minor changes